diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-15 23:50:00 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-15 23:50:00 +0100 |
| commit | d15d40ad6969cc2d0945853fa13622cbef9f5b98 (patch) | |
| tree | d47f3bd2c09ee9578e68defd7804017ec8701cfb /source/cEntity.h | |
| parent | New players no longer cause an assert (diff) | |
| download | cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar.gz cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar.bz2 cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar.lz cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar.xz cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.tar.zst cuberite-d15d40ad6969cc2d0945853fa13622cbef9f5b98.zip | |
Diffstat (limited to 'source/cEntity.h')
| -rw-r--r-- | source/cEntity.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/cEntity.h b/source/cEntity.h index b406e759f..f08a9f337 100644 --- a/source/cEntity.h +++ b/source/cEntity.h @@ -68,16 +68,16 @@ public: //tolua_export virtual bool IsA( const char* a_EntityType ); //tolua_export
virtual const char* GetClass(); //tolua_export
- cWorld * GetWorld(void) const { return m_World; } //tolua_export
-
- const Vector3d & GetPosition(void) const {return *m_Pos; } //tolua_export
- const double & GetPosX (void) const {return m_Pos->x; } //tolua_export
- const double & GetPosY (void) const {return m_Pos->y; } //tolua_export
- const double & GetPosZ (void) const {return m_Pos->z; } //tolua_export
- const Vector3f & GetRot (void) const {return *m_Rot; } //tolua_export
- float GetRotation(void) const {return m_Rot->x; } //tolua_export
- float GetPitch (void) const {return m_Rot->y; } //tolua_export
- float GetRoll (void) const {return m_Rot->z; } //tolua_export
+ cWorld * GetWorld(void) const { return m_World; } //tolua_export
+
+ const Vector3d & GetPosition(void) const {return m_Pos; } //tolua_export
+ const double & GetPosX (void) const {return m_Pos.x; } //tolua_export
+ const double & GetPosY (void) const {return m_Pos.y; } //tolua_export
+ const double & GetPosZ (void) const {return m_Pos.z; } //tolua_export
+ const Vector3f & GetRot (void) const {return m_Rot; } //tolua_export
+ float GetRotation(void) const {return m_Rot.x; } //tolua_export
+ float GetPitch (void) const {return m_Rot.y; } //tolua_export
+ float GetRoll (void) const {return m_Rot.z; } //tolua_export
Vector3f GetLookVector(); //tolua_export
void SetPosX( const double & a_PosX ); //tolua_export
@@ -122,10 +122,10 @@ protected: cReferenceManager* m_References;
int m_ChunkX, m_ChunkY, m_ChunkZ;
- Vector3d* m_Pos;
+ Vector3d m_Pos;
bool m_bDirtyPosition;
- Vector3f* m_Rot;
+ Vector3f m_Rot;
bool m_bDirtyOrientation;
bool m_bDestroyed;
|