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/gamecontroller.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game/server/gamecontroller.h') diff --git a/src/game/server/gamecontroller.h b/src/game/server/gamecontroller.h index 070cb094..36989454 100644 --- a/src/game/server/gamecontroller.h +++ b/src/game/server/gamecontroller.h @@ -77,14 +77,14 @@ public: void EndRound(); void ChangeMap(const char *pToMap); - bool IsFriendlyFire(int Cid1, int Cid2); + bool IsFriendlyFire(int ClientID1, int ClientID2); bool IsForceBalanced(); /* */ - virtual bool CanBeMovedOnBalance(int Cid); + virtual bool CanBeMovedOnBalance(int ClientID); virtual void Tick(); @@ -135,8 +135,8 @@ public: */ virtual const char *GetTeamName(int Team); - virtual int GetAutoTeam(int NotThisId); - virtual bool CanJoinTeam(int Team, int NotThisId); + virtual int GetAutoTeam(int NotThisID); + virtual bool CanJoinTeam(int Team, int NotThisID); bool CheckTeamBalance(); bool CanChangeTeam(CPlayer *pPplayer, int JoinTeam); int ClampTeam(int Team); -- cgit 1.4.1