From 9811c2396baa86e3401caef295649eaf3e12a4a5 Mon Sep 17 00:00:00 2001 From: oy Date: Fri, 4 Mar 2011 17:08:10 +0100 Subject: made network clip flags. Closes #131 --- src/game/client/components/menus_ingame.cpp | 43 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'src/game/client/components/menus_ingame.cpp') diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp index ffb4bdfe..9a4ee5dc 100644 --- a/src/game/client/components/menus_ingame.cpp +++ b/src/game/client/components/menus_ingame.cpp @@ -35,7 +35,7 @@ void CMenus::RenderGame(CUIRect MainView) if(DoButton_Menu(&s_DisconnectButton, Localize("Disconnect"), 0, &Button)) Client()->Disconnect(); - if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameobj) + if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj) { if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS) { @@ -49,7 +49,7 @@ void CMenus::RenderGame(CUIRect MainView) } } - if(m_pClient->m_Snap.m_pGameobj->m_Flags & GAMEFLAG_TEAMS) + if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) { if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED) { @@ -248,24 +248,27 @@ void CMenus::RenderServerInfo(CUIRect MainView) TextRender()->Text(0, GameInfo.x+x, GameInfo.y+y, 32, Localize("Game info"), 250); y += 32.0f+5.0f; - mem_zero(aBuf, sizeof(aBuf)); - str_format( - aBuf, - sizeof(aBuf), - "\n\n" - "%s: %s\n" - "%s: %s\n" - "%s: %d\n" - "%s: %d\n" - "\n" - "%s: %d/%d\n", - Localize("Game type"), CurrentServerInfo.m_aGameType, - Localize("Map"), CurrentServerInfo.m_aMap, - Localize("Score limit"), m_pClient->m_Snap.m_pGameobj->m_ScoreLimit, - Localize("Time limit"), m_pClient->m_Snap.m_pGameobj->m_TimeLimit, - Localize("Players"), m_pClient->m_Snap.m_NumPlayers, CurrentServerInfo.m_MaxPlayers - ); - TextRender()->Text(0, GameInfo.x+x, GameInfo.y+y, 20, aBuf, 250); + if(m_pClient->m_Snap.m_pGameInfoObj) + { + mem_zero(aBuf, sizeof(aBuf)); + str_format( + aBuf, + sizeof(aBuf), + "\n\n" + "%s: %s\n" + "%s: %s\n" + "%s: %d\n" + "%s: %d\n" + "\n" + "%s: %d/%d\n", + Localize("Game type"), CurrentServerInfo.m_aGameType, + Localize("Map"), CurrentServerInfo.m_aMap, + Localize("Score limit"), m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit, + Localize("Time limit"), m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit, + Localize("Players"), m_pClient->m_Snap.m_NumPlayers, CurrentServerInfo.m_MaxPlayers + ); + TextRender()->Text(0, GameInfo.x+x, GameInfo.y+y, 20, aBuf, 250); + } // motd Motd.HSplitTop(10.0f, 0, &Motd); -- cgit 1.4.1