about summary refs log tree commit diff
path: root/src/game/server/entity.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-19 18:27:50 +0100
committeroy <Tom_Adams@web.de>2011-01-19 18:27:50 +0100
commit19a9462fe88b2573ab9f24a2890d4affb2bdcf47 (patch)
tree699ea43000384716ef42843b2f2a7f33010f9a67 /src/game/server/entity.cpp
parent7ca7c95bc0d29aca731838d9c404c038cbc15599 (diff)
downloadzcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.tar.gz
zcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.zip
removed double entity list in gameworld and cleaned up connected stuff
Diffstat (limited to 'src/game/server/entity.cpp')
-rw-r--r--src/game/server/entity.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
index 5241c06b..aff36943 100644
--- a/src/game/server/entity.cpp
+++ b/src/game/server/entity.cpp
@@ -11,15 +11,13 @@ CEntity::CEntity(CGameWorld *pGameWorld, int ObjType)
 {
 	m_pGameWorld = pGameWorld;
 	
-	m_Objtype = ObjType;
+	m_ObjType = ObjType;
 	m_Pos = vec2(0,0);
 	m_ProximityRadius = 0;
 
 	m_MarkedForDestroy = false;	
 	m_Id = Server()->SnapNewID();
 
-	m_pNextEntity = 0;
-	m_pPrevEntity = 0;
 	m_pPrevTypeEntity = 0;
 	m_pNextTypeEntity = 0;
 }