diff options
| author | oy <Tom_Adams@web.de> | 2011-03-12 18:07:57 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-03-12 18:07:57 +0100 |
| commit | b834426548107af96c2568af22cbf8604f230965 (patch) | |
| tree | 893a04ec6b37d7b1d92ee66d39707463f48e847c /src/game/client/components/hud.cpp | |
| parent | 7b98b3ddeddd34bf0fa0c84b13d928a9dafe140c (diff) | |
| download | zcatch-b834426548107af96c2568af22cbf8604f230965.tar.gz zcatch-b834426548107af96c2568af22cbf8604f230965.zip | |
fixed several problems with spectator view in game and demo player. Closes #83
Diffstat (limited to 'src/game/client/components/hud.cpp')
| -rw-r--r-- | src/game/client/components/hud.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp index aff76bc8..a9869bb3 100644 --- a/src/game/client/components/hud.cpp +++ b/src/game/client/components/hud.cpp @@ -406,8 +406,8 @@ void CHud::RenderSpectatorHud() // draw the text char aBuf[128]; - str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Spectate"), m_pClient->m_Snap.m_pSpectatorInfo && m_pClient->m_Snap.m_pSpectatorInfo->m_SpectatorID != SPEC_FREEVIEW ? - m_pClient->m_aClients[m_pClient->m_Snap.m_pSpectatorInfo->m_SpectatorID].m_aName : Localize("Free-View")); + str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Spectate"), m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW ? + m_pClient->m_aClients[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID].m_aName : Localize("Free-View")); TextRender()->Text(0, m_Width-174.0f, m_Height-13.0f, 8.0f, aBuf, -1); } @@ -422,10 +422,10 @@ void CHud::OnRender() if(m_pClient->m_Snap.m_pLocalCharacter && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_GAMEOVER)) RenderHealthAndAmmo(m_pClient->m_Snap.m_pLocalCharacter); - else if(m_pClient->m_Snap.m_Spectate) + else if(m_pClient->m_Snap.m_SpecInfo.m_Active) { - if(m_pClient->m_Snap.m_pSpectatorInfo && m_pClient->m_Snap.m_pSpectatorInfo->m_SpectatorID != SPEC_FREEVIEW) - RenderHealthAndAmmo(&m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_pSpectatorInfo->m_SpectatorID].m_Cur); + if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW) + RenderHealthAndAmmo(&m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID].m_Cur); RenderSpectatorHud(); } |