diff options
| author | oy <Tom_Adams@web.de> | 2011-07-05 23:15:24 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-07-05 23:15:24 +0200 |
| commit | ac9c3b8f7f26b3b1676345ddca82272fd31fc0ff (patch) | |
| tree | 51851499a7d3f993a4a997660504e38b3395853e /src/game/client/gameclient.cpp | |
| parent | ab1f7d6f95346c7bf86dfbdfa015c7e850097918 (diff) | |
| download | zcatch-ac9c3b8f7f26b3b1676345ddca82272fd31fc0ff.tar.gz zcatch-ac9c3b8f7f26b3b1676345ddca82272fd31fc0ff.zip | |
made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631
Diffstat (limited to 'src/game/client/gameclient.cpp')
| -rw-r--r-- | src/game/client/gameclient.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index a3c2dfc2..4618d7dc 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -341,6 +341,8 @@ void CGameClient::OnReset() m_All.m_paComponents[i]->OnReset(); m_DemoSpecID = SPEC_FREEVIEW; + m_FlagDropTick[TEAM_RED] = 0; + m_FlagDropTick[TEAM_BLUE] = 0; } @@ -783,6 +785,20 @@ void CGameClient::OnNewSnapshot() { m_Snap.m_pGameDataObj = (const CNetObj_GameData *)pData; m_Snap.m_GameDataSnapID = Item.m_ID; + if(m_Snap.m_pGameDataObj->m_FlagCarrierRed == FLAG_TAKEN) + { + if(m_FlagDropTick[TEAM_RED] == 0) + m_FlagDropTick[TEAM_RED] = Client()->GameTick(); + } + else if(m_FlagDropTick[TEAM_RED] != 0) + m_FlagDropTick[TEAM_RED] = 0; + if(m_Snap.m_pGameDataObj->m_FlagCarrierBlue == FLAG_TAKEN) + { + if(m_FlagDropTick[TEAM_BLUE] == 0) + m_FlagDropTick[TEAM_BLUE] = Client()->GameTick(); + } + else if(m_FlagDropTick[TEAM_BLUE] != 0) + m_FlagDropTick[TEAM_BLUE] = 0; } else if(Item.m_Type == NETOBJTYPE_FLAG) m_Snap.m_paFlags[Item.m_ID%2] = (const CNetObj_Flag *)pData; |