summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2016-08-28 23:48:10 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2016-08-28 23:48:10 +0200
commitf3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9 (patch)
tree775d91a58a07e250a3e14f4a88d233488e8755b9 /src/Entities
parenttest (diff)
downloadcuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar.gz
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar.bz2
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar.lz
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar.xz
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.tar.zst
cuberite-f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h2
-rw-r--r--src/Entities/Player.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 94c1e681d..a8074406c 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -301,7 +301,7 @@ public:
virtual bool DoTakeDamage(TakeDamageInfo & a_TDI);
/** Returns the position stored before the last call to SetPosition. */
- auto GetLastPosition(void) const { return m_LastPosition; }
+ Vector3d GetLastPosition(void) const { return m_LastPosition; }
// tolua_begin
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 988b5b326..c8e7b8297 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -235,7 +235,7 @@ public:
// tolua_end
/** Returns the SharedPtr to client handle associated with the player. */
- auto GetClientHandlePtr(void) const { return m_ClientHandle; }
+ std::weak_ptr<cClientHandle> GetClientHandlePtr(void) const { return m_ClientHandle; }
// tolua_begin