about summary refs log tree commit diff
path: root/src/game/server/player.cpp
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/player.cpp
parente45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff)
downloadzcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz
zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/game/server/player.cpp')
-rw-r--r--src/game/server/player.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 5147cbfb..32eec986 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -9,14 +9,14 @@ MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS)
 
 IServer *CPlayer::Server() const { return m_pGameServer->Server(); }
 	
-CPlayer::CPlayer(CGameContext *pGameServer, int CID, int Team)
+CPlayer::CPlayer(CGameContext *pGameServer, int ClientID, int Team)
 {
 	m_pGameServer = pGameServer;
 	m_RespawnTick = Server()->Tick();
 	m_DieTick = Server()->Tick();
 	m_ScoreStartTick = Server()->Tick();
 	Character = 0;
-	this->m_ClientID = CID;
+	this->m_ClientID = ClientID;
 	m_Team = GameServer()->m_pController->ClampTeam(Team);
 	m_LastActionTick = Server()->Tick();
 }
@@ -102,7 +102,7 @@ void CPlayer::Snap(int SnappingClient)
 	pPlayerInfo->m_Latency = m_Latency.m_Min;
 	pPlayerInfo->m_LatencyFlux = m_Latency.m_Max-m_Latency.m_Min;
 	pPlayerInfo->m_Local = 0;
-	pPlayerInfo->m_ClientId = m_ClientID;
+	pPlayerInfo->m_ClientID = m_ClientID;
 	pPlayerInfo->m_Score = m_Score;
 	pPlayerInfo->m_Team = m_Team;