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/gamecontext.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/gamecontext.h')
| -rw-r--r-- | src/game/server/gamecontext.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h index 99e7e56d..6ad7204d 100644 --- a/src/game/server/gamecontext.h +++ b/src/game/server/gamecontext.h @@ -80,14 +80,14 @@ public: CGameWorld m_World; // helper functions - class CCharacter *GetPlayerChar(int ClientId); + class CCharacter *GetPlayerChar(int ClientID); // voting void StartVote(const char *pDesc, const char *pCommand); void EndVote(); - void SendVoteSet(int ClientId); - void SendVoteStatus(int ClientId, int Total, int Yes, int No); - void AbortVoteKickOnDisconnect(int ClientId); + void SendVoteSet(int ClientID); + void SendVoteStatus(int ClientID, int Total, int Yes, int No); + void AbortVoteKickOnDisconnect(int ClientID); int m_VoteCreator; int64 m_VoteCloseTime; @@ -133,15 +133,15 @@ public: // network void SendChatTarget(int To, const char *pText); - void SendChat(int ClientId, int Team, const char *pText); - void SendEmoticon(int ClientId, int Emoticon); - void SendWeaponPickup(int ClientId, int Weapon); - void SendBroadcast(const char *pText, int ClientId); + void SendChat(int ClientID, int Team, const char *pText); + void SendEmoticon(int ClientID, int Emoticon); + void SendWeaponPickup(int ClientID, int Weapon); + void SendBroadcast(const char *pText, int ClientID); // void CheckPureTuning(); - void SendTuningParams(int ClientId); + void SendTuningParams(int ClientID); // engine events virtual void OnInit(); @@ -150,23 +150,23 @@ public: virtual void OnTick(); virtual void OnPreSnap(); - virtual void OnSnap(int ClientId); + virtual void OnSnap(int ClientID); virtual void OnPostSnap(); - virtual void OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId); + virtual void OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID); - virtual void OnClientConnected(int ClientId); - virtual void OnClientEnter(int ClientId); - virtual void OnClientDrop(int ClientId); - virtual void OnClientDirectInput(int ClientId, void *pInput); - virtual void OnClientPredictedInput(int ClientId, void *pInput); + virtual void OnClientConnected(int ClientID); + virtual void OnClientEnter(int ClientID); + virtual void OnClientDrop(int ClientID); + virtual void OnClientDirectInput(int ClientID, void *pInput); + virtual void OnClientPredictedInput(int ClientID, void *pInput); virtual const char *Version(); virtual const char *NetVersion(); }; inline int CmaskAll() { return -1; } -inline int CmaskOne(int ClientId) { return 1<<ClientId; } -inline int CmaskAllExceptOne(int ClientId) { return 0x7fffffff^CmaskOne(ClientId); } -inline bool CmaskIsSet(int Mask, int ClientId) { return (Mask&CmaskOne(ClientId)) != 0; } +inline int CmaskOne(int ClientID) { return 1<<ClientID; } +inline int CmaskAllExceptOne(int ClientID) { return 0x7fffffff^CmaskOne(ClientID); } +inline bool CmaskIsSet(int Mask, int ClientID) { return (Mask&CmaskOne(ClientID)) != 0; } #endif |