about summary refs log tree commit diff
path: root/src/game/server/entities
diff options
context:
space:
mode:
authorGreYFoXGTi <GreYFoXGTi@GMaiL.CoM>2011-02-12 12:40:36 +0200
committeroy <Tom_Adams@web.de>2011-02-12 21:18:41 +0100
commit1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 (patch)
treed4b94b98105c3af23c79bae02a132bfe66738392 /src/game/server/entities
parente45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff)
downloadzcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz
zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/game/server/entities')
-rw-r--r--src/game/server/entities/laser.cpp2
-rw-r--r--src/game/server/entities/pickup.cpp2
-rw-r--r--src/game/server/entities/projectile.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index 2f6568fa..184702cb 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -97,7 +97,7 @@ void CLaser::Snap(int SnappingClient)
 	if(NetworkClipped(SnappingClient))
 		return;
 
-	CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_Id, sizeof(CNetObj_Laser)));
+	CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser)));
 	if(!pObj)
 		return;
 
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp
index 136e3efe..56b319d2 100644
--- a/src/game/server/entities/pickup.cpp
+++ b/src/game/server/entities/pickup.cpp
@@ -122,7 +122,7 @@ void CPickup::Snap(int SnappingClient)
 	if(m_SpawnTick != -1 || NetworkClipped(SnappingClient))
 		return;
 
-	CNetObj_Pickup *pP = static_cast<CNetObj_Pickup *>(Server()->SnapNewItem(NETOBJTYPE_PICKUP, m_Id, sizeof(CNetObj_Pickup)));
+	CNetObj_Pickup *pP = static_cast<CNetObj_Pickup *>(Server()->SnapNewItem(NETOBJTYPE_PICKUP, m_ID, sizeof(CNetObj_Pickup)));
 	if(!pP)
 		return;
 
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
index 6e256e95..07e96627 100644
--- a/src/game/server/entities/projectile.cpp
+++ b/src/game/server/entities/projectile.cpp
@@ -99,7 +99,7 @@ void CProjectile::Snap(int SnappingClient)
 	if(NetworkClipped(SnappingClient, GetPos(Ct)))
 		return;
 
-	CNetObj_Projectile *pProj = static_cast<CNetObj_Projectile *>(Server()->SnapNewItem(NETOBJTYPE_PROJECTILE, m_Id, sizeof(CNetObj_Projectile)));
+	CNetObj_Projectile *pProj = static_cast<CNetObj_Projectile *>(Server()->SnapNewItem(NETOBJTYPE_PROJECTILE, m_ID, sizeof(CNetObj_Projectile)));
 	if(pProj)
 		FillInfo(pProj);
 }