diff options
| author | oy <Tom_Adams@web.de> | 2011-01-03 12:50:38 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-03 12:50:38 +0100 |
| commit | a72848e78032014adb1bf053c4556bf1072b0c2d (patch) | |
| tree | 5a9da24803f3432c79229b87abe77b6235668e19 /src/game/client/gameclient.cpp | |
| parent | b29b6d0bcff3d22fe5dac3453689fb8d315cf3ee (diff) | |
| download | zcatch-a72848e78032014adb1bf053c4556bf1072b0c2d.tar.gz zcatch-a72848e78032014adb1bf053c4556bf1072b0c2d.zip | |
added constants for teams by Choupom
Diffstat (limited to 'src/game/client/gameclient.cpp')
| -rw-r--r-- | src/game/client/gameclient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 4696bdcd..ceae1b5d 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -689,7 +689,7 @@ void CGameClient::OnNewSnapshot() // go trough all the items in the snapshot and gather the info we want { - m_Snap.m_aTeamSize[0] = m_Snap.m_aTeamSize[1] = 0; + m_Snap.m_aTeamSize[TEAM_RED] = m_Snap.m_aTeamSize[TEAM_BLUE] = 0; int Num = Client()->SnapNumItems(IClient::SNAP_CURRENT); for(int i = 0; i < Num; i++) @@ -750,12 +750,12 @@ void CGameClient::OnNewSnapshot() m_Snap.m_LocalCid = Item.m_Id; m_Snap.m_pLocalInfo = pInfo; - if (pInfo->m_Team == -1) + if(pInfo->m_Team == TEAM_SPECTATORS) m_Snap.m_Spectate = true; } // calculate team-balance - if(pInfo->m_Team != -1) + if(pInfo->m_Team != TEAM_SPECTATORS) m_Snap.m_aTeamSize[pInfo->m_Team]++; } @@ -955,7 +955,7 @@ void CGameClient::CClientData::UpdateRenderInfo() if(g_GameClient.m_Snap.m_pGameobj && g_GameClient.m_Snap.m_pGameobj->m_Flags&GAMEFLAG_TEAMS) { const int TeamColors[2] = {65387, 10223467}; - if(m_Team >= 0 && m_Team <= 1) + if(m_Team >= TEAM_RED && m_Team <= TEAM_BLUE) { m_RenderInfo.m_Texture = g_GameClient.m_pSkins->Get(m_SkinId)->m_ColorTexture; m_RenderInfo.m_ColorBody = g_GameClient.m_pSkins->GetColorV4(TeamColors[m_Team]); |