From 55b8495bf31875949fda825e2bbfe4004d815231 Mon Sep 17 00:00:00 2001 From: "keyboard.osh@gmail.com" Date: Sun, 28 Apr 2013 18:54:43 +0000 Subject: cEntity: Added mass to entities. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1430 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Entity.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source/Entity.h') diff --git a/source/Entity.h b/source/Entity.h index 3009bc611..779ce5358 100644 --- a/source/Entity.h +++ b/source/Entity.h @@ -107,6 +107,7 @@ public: cWorld * GetWorld(void) const { return m_World; } double GetHeadYaw (void) const {return m_HeadYaw; } + double GetMass (void) const {return m_Mass; } const Vector3d & GetPosition (void) const {return m_Pos; } double GetPosX (void) const {return m_Pos.x; } double GetPosY (void) const {return m_Pos.y; } @@ -125,6 +126,7 @@ public: int GetChunkZ(void) const {return FAST_FLOOR_DIV(((int)m_Pos.z), cChunkDef::Width); } void SetHeadYaw (double a_HeadYaw); + void SetMass (double a_Mass); void SetPosX (double a_PosX); void SetPosY (double a_PosY); void SetPosZ (double a_PosZ); @@ -247,11 +249,18 @@ protected: void ReferencedBy( cEntity*& a_EntityPtr ); void Dereference( cEntity*& a_EntityPtr ); private: + //Measured in degrees (MAX 360°) double m_HeadYaw; + //Measured in meter/second (m/s) Vector3d m_Speed; + //Measured in degrees (MAX 360°) Vector3d m_Rot; + //Measured in meters (1 meter = 1 block) (m) Vector3d m_Pos; + //Measured in meter/second Vector3d m_WaterSpeed; + //Measured in Kilograms (Kg) + double m_Mass } ; // tolua_export typedef std::list cEntityList; -- cgit v1.2.3