From 19a9462fe88b2573ab9f24a2890d4affb2bdcf47 Mon Sep 17 00:00:00 2001 From: oy Date: Wed, 19 Jan 2011 18:27:50 +0100 Subject: removed double entity list in gameworld and cleaned up connected stuff --- src/game/server/entity.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/game/server/entity.h') 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(); -- cgit 1.4.1