summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-12-11 21:22:09 +0100
committerGitHub <noreply@github.com>2016-12-11 21:22:09 +0100
commitc59ff9b431cb46ce90f8f4b37ce16fab77841fdd (patch)
treefb810cb4529cabb39927da41d80491db009f7723 /src/Entities
parentPowered rails can kick-start minecarts (#3472) (diff)
parentExport GetPosition and GetSpeed from cEntity as a copy instead of a pointer to lua. (diff)
downloadcuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar.gz
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar.bz2
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar.lz
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar.xz
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.tar.zst
cuberite-c59ff9b431cb46ce90f8f4b37ce16fab77841fdd.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 4833f8b5c..c9d445de7 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -191,7 +191,6 @@ public:
double GetHeadYaw (void) const { return m_HeadYaw; } // In degrees
double GetHeight (void) const { return m_Height; }
double GetMass (void) const { return m_Mass; }
- const Vector3d & GetPosition (void) const { return m_Position; }
double GetPosX (void) const { return m_Position.x; }
double GetPosY (void) const { return m_Position.y; }
double GetPosZ (void) const { return m_Position.z; }
@@ -199,7 +198,6 @@ public:
double GetPitch (void) const { return m_Rot.y; } // In degrees, [-180, +180), but normal client clips to [-90, +90]
double GetRoll (void) const { return m_Rot.z; } // In degrees, unused in current client
Vector3d GetLookVector(void) const;
- const Vector3d & GetSpeed (void) const { return m_Speed; }
double GetSpeedX (void) const { return m_Speed.x; }
double GetSpeedY (void) const { return m_Speed.y; }
double GetSpeedZ (void) const { return m_Speed.z; }
@@ -292,6 +290,12 @@ public:
// tolua_end
+ /** Exported in ManualBindings */
+ const Vector3d & GetPosition(void) const { return m_Position; }
+
+ /** Exported in ManualBindings */
+ const Vector3d & GetSpeed(void) const { return m_Speed; }
+
/** Destroy the entity without scheduling memory freeing. This should only be used by cChunk or cClientHandle for internal memory management. */
void DestroyNoScheduling(bool a_ShouldBroadcast);