diff options
| author | GreYFoXGTi <GreYFoXGTi@GMaiL.CoM> | 2011-02-12 12:40:36 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-12 21:18:41 +0100 |
| commit | 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 (patch) | |
| tree | d4b94b98105c3af23c79bae02a132bfe66738392 /src/game/server/gamecontroller.h | |
| parent | e45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff) | |
| download | zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip | |
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/game/server/gamecontroller.h')
| -rw-r--r-- | src/game/server/gamecontroller.h | 8 |
1 files changed, 4 insertions, 4 deletions
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); |