From d15d40ad6969cc2d0945853fa13622cbef9f5b98 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 15 Feb 2012 22:50:00 +0000 Subject: No longer using pointers for Vector3(f/d/i) in cEntity's and cTracer git-svn-id: http://mc-server.googlecode.com/svn/trunk@268 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cEntity.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'source/cEntity.h') 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; -- cgit v1.2.3