From 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 12 Feb 2011 12:40:36 +0200 Subject: Refactoring & fixed WEAPONSPEC_GUN in content.py --- src/game/server/gamemodes/ctf.cpp | 4 ++-- src/game/server/gamemodes/ctf.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game/server/gamemodes') 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); -- cgit 1.4.1