diff options
| -rw-r--r-- | src/game/client/components/hud.cpp | 35 | ||||
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 6 | ||||
| -rw-r--r-- | src/game/variables.h | 1 |
3 files changed, 26 insertions, 16 deletions
diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp index c0273cfe..00fdd88d 100644 --- a/src/game/client/components/hud.cpp +++ b/src/game/client/components/hud.cpp @@ -426,23 +426,26 @@ void CHud::OnRender() m_Height = 300.0f; Graphics()->MapScreen(0.0f, 0.0f, m_Width, m_Height); - 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_SpecInfo.m_Active) + if(g_Config.m_ClShowhud) { - 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(); - } + 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_SpecInfo.m_Active) + { + 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(); + } - RenderGameTimer(); - RenderSuddenDeath(); - RenderScoreHud(); - RenderWarmupTimer(); - RenderFps(); - if(Client()->State() != IClient::STATE_DEMOPLAYBACK) - RenderConnectionWarning(); - RenderTeambalanceWarning(); - RenderVoting(); + RenderGameTimer(); + RenderSuddenDeath(); + RenderScoreHud(); + RenderWarmupTimer(); + RenderFps(); + if(Client()->State() != IClient::STATE_DEMOPLAYBACK) + RenderConnectionWarning(); + RenderTeambalanceWarning(); + RenderVoting(); + } RenderCursor(); } diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 31b2bf82..07e7e3bc 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -187,6 +187,12 @@ void CMenus::RenderSPPage0(CUIRect MainView) if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeapons, Localize("Switch weapon on pickup"), g_Config.m_ClAutoswitchWeapons, &Button)) g_Config.m_ClAutoswitchWeapons ^= 1; + // show hud + Left.HSplitTop(5.0f, 0, &Left); + Left.HSplitTop(20.0f, &Button, &Left); + if(DoButton_CheckBox(&g_Config.m_ClShowhud, Localize("Show ingame HUD"), g_Config.m_ClShowhud, &Button)) + g_Config.m_ClShowhud ^= 1; + // name plates Right.HSplitTop(20.0f, &Button, &Right); if(DoButton_CheckBox(&g_Config.m_ClNameplates, Localize("Show name plates"), g_Config.m_ClNameplates, &Button)) diff --git a/src/game/variables.h b/src/game/variables.h index ebcdde00..283d8b6f 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -13,6 +13,7 @@ MACRO_CONFIG_INT(ClNameplatesTeamcolors, cl_nameplates_teamcolors, 1, 0, 1, CFGF MACRO_CONFIG_INT(ClNameplatesSize, cl_nameplates_size, 50, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Size of the name plates from 0 to 100%") MACRO_CONFIG_INT(ClAutoswitchWeapons, cl_autoswitch_weapons, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Auto switch weapon on pickup") +MACRO_CONFIG_INT(ClShowhud, cl_showhud, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show ingame HUD") MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show ingame FPS counter") MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") |