about summary refs log tree commit diff
path: root/src/game/server/gamemodes
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/gamemodes
parente45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff)
downloadzcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz
zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/game/server/gamemodes')
-rw-r--r--src/game/server/gamemodes/ctf.cpp4
-rw-r--r--src/game/server/gamemodes/ctf.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp
index 6cefe435..f4ef6808 100644
--- a/src/game/server/gamemodes/ctf.cpp
+++ b/src/game/server/gamemodes/ctf.cpp
@@ -63,9 +63,9 @@ int CGameControllerCTF::OnCharacterDeath(class CCharacter *pVictim, class CPlaye
 	return HadFlag;
 }
 
-bool CGameControllerCTF::CanBeMovedOnBalance(int Cid)
+bool CGameControllerCTF::CanBeMovedOnBalance(int ClientID)
 {
-	CCharacter* Character = GameServer()->m_apPlayers[Cid]->GetCharacter();
+	CCharacter* Character = GameServer()->m_apPlayers[ClientID]->GetCharacter();
 	if(Character)
 	{
 		for(int fi = 0; fi < 2; fi++)
diff --git a/src/game/server/gamemodes/ctf.h b/src/game/server/gamemodes/ctf.h
index ffe0baba..e6fb9c89 100644
--- a/src/game/server/gamemodes/ctf.h
+++ b/src/game/server/gamemodes/ctf.h
@@ -11,7 +11,7 @@ public:
 	class CFlag *m_apFlags[2];
 	
 	CGameControllerCTF(class CGameContext *pGameServer);
-	virtual bool CanBeMovedOnBalance(int Cid);
+	virtual bool CanBeMovedOnBalance(int ClientID);
 	virtual void Tick();
 	
 	virtual bool OnEntity(int Index, vec2 Pos);