diff options
| author | oy <Tom_Adams@web.de> | 2011-01-19 18:27:50 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-19 18:27:50 +0100 |
| commit | 19a9462fe88b2573ab9f24a2890d4affb2bdcf47 (patch) | |
| tree | 699ea43000384716ef42843b2f2a7f33010f9a67 /src/game/server/entity.h | |
| parent | 7ca7c95bc0d29aca731838d9c404c038cbc15599 (diff) | |
| download | zcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.tar.gz zcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.zip | |
removed double entity list in gameworld and cleaned up connected stuff
Diffstat (limited to 'src/game/server/entity.h')
| -rw-r--r-- | src/game/server/entity.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/server/entity.h b/src/game/server/entity.h index dc50daca..d56c60e7 100644 --- a/src/game/server/entity.h +++ b/src/game/server/entity.h @@ -57,11 +57,8 @@ class CEntity { MACRO_ALLOC_HEAP() -private: - friend class CGameWorld; // thy these? - CEntity *m_pPrevEntity; - CEntity *m_pNextEntity; + friend class CGameWorld; // entity list handling CEntity *m_pPrevTypeEntity; CEntity *m_pNextTypeEntity; @@ -69,7 +66,7 @@ private: protected: bool m_MarkedForDestroy; int m_Id; - int m_Objtype; + int m_ObjType; public: CEntity(CGameWorld *pGameWorld, int Objtype); virtual ~CEntity(); |