diff options
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 36 | ||||
| -rw-r--r-- | src/game/client/components/nameplates.cpp | 2 | ||||
| -rw-r--r-- | src/game/variables.h | 7 |
3 files changed, 25 insertions, 20 deletions
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index b0309ee4..31b2bf82 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -156,10 +156,14 @@ void CMenus::RenderSPPage0(CUIRect MainView) m_NeedSendinfo = true; } - // dynamic camera + CUIRect Left, Right; MainView.HSplitTop(20.0f, 0, &MainView); - MainView.HSplitTop(20.0f, &Button, &MainView); - Button.VSplitLeft(230.0f, &Button, 0); + MainView.VSplitMid(&Left, &Right); + Left.VSplitRight(5.0f, &Left, 0); + Right.VMargin(5.0f, &Right); + + // dynamic camera + Left.HSplitTop(20.0f, &Button, &Left); static int s_DynamicCameraButton = 0; if(DoButton_CheckBox(&s_DynamicCameraButton, Localize("Dynamic Camera"), g_Config.m_ClMouseDeadzone != 0, &Button)) { @@ -178,35 +182,35 @@ void CMenus::RenderSPPage0(CUIRect MainView) } // weapon pickup - MainView.HSplitTop(5.0f, 0, &MainView); - MainView.HSplitTop(20.0f, &Button, &MainView); - Button.VSplitLeft(230.0f, &Button, 0); + Left.HSplitTop(5.0f, 0, &Left); + Left.HSplitTop(20.0f, &Button, &Left); if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeapons, Localize("Switch weapon on pickup"), g_Config.m_ClAutoswitchWeapons, &Button)) g_Config.m_ClAutoswitchWeapons ^= 1; // name plates - MainView.HSplitTop(5.0f, 0, &MainView); - MainView.HSplitTop(20.0f, &Button, &MainView); - Button.VSplitLeft(230.0f, &Button, 0); + Right.HSplitTop(20.0f, &Button, &Right); if(DoButton_CheckBox(&g_Config.m_ClNameplates, Localize("Show name plates"), g_Config.m_ClNameplates, &Button)) g_Config.m_ClNameplates ^= 1; if(g_Config.m_ClNameplates) { - MainView.HSplitTop(2.5f, 0, &MainView); - MainView.VSplitLeft(30.0f, 0, &MainView); - MainView.VSplitLeft(200.0f, &MainView, 0); - MainView.HSplitTop(20.0f, &Button, &MainView); + Right.HSplitTop(2.5f, 0, &Right); + Right.VSplitLeft(30.0f, 0, &Right); + Right.HSplitTop(20.0f, &Button, &Right); if(DoButton_CheckBox(&g_Config.m_ClNameplatesAlways, Localize("Always show name plates"), g_Config.m_ClNameplatesAlways, &Button)) g_Config.m_ClNameplatesAlways ^= 1; - MainView.HSplitTop(2.5f, 0, &MainView); - MainView.HSplitTop(20.0f, &Label, &MainView); - MainView.HSplitTop(20.0f, &Button, &MainView); + Right.HSplitTop(2.5f, 0, &Right); + Right.HSplitTop(20.0f, &Label, &Right); + Right.HSplitTop(20.0f, &Button, &Right); str_format(aBuf, sizeof(aBuf), "%s: %i", Localize("Name plates size"), g_Config.m_ClNameplatesSize); UI()->DoLabelScaled(&Label, aBuf, 13.0f, -1); Button.HMargin(2.0f, &Button); g_Config.m_ClNameplatesSize = (int)(DoScrollbarH(&g_Config.m_ClNameplatesSize, &Button, g_Config.m_ClNameplatesSize/100.0f)*100.0f+0.1f); + + Right.HSplitTop(20.0f, &Button, &Right); + if(DoButton_CheckBox(&g_Config.m_ClNameplatesTeamcolors, Localize("Use team colors for name plates"), g_Config.m_ClNameplatesTeamcolors, &Button)) + g_Config.m_ClNameplatesTeamcolors ^= 1; } } diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp index 9fa7e06a..fecd6227 100644 --- a/src/game/client/components/nameplates.cpp +++ b/src/game/client/components/nameplates.cpp @@ -34,7 +34,7 @@ void CNamePlates::RenderNameplate( TextRender()->TextOutlineColor(0.0f, 0.0f, 0.0f, 0.5f*a); TextRender()->TextColor(1.0f, 1.0f, 1.0f, a); - if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags&GAMEFLAG_TEAMS) + if(g_Config.m_ClNameplatesTeamcolors && m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags&GAMEFLAG_TEAMS) { if(pPlayerInfo->m_Team == TEAM_RED) TextRender()->TextColor(1.0f, 0.5f, 0.5f, a); diff --git a/src/game/variables.h b/src/game/variables.h index d69b56d3..ebcdde00 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -7,9 +7,10 @@ // client MACRO_CONFIG_INT(ClPredict, cl_predict, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Predict client movements") -MACRO_CONFIG_INT(ClNameplates, cl_nameplates, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show nameplates") -MACRO_CONFIG_INT(ClNameplatesAlways, cl_nameplates_always, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Always show nameplats disregarding of distance") -MACRO_CONFIG_INT(ClNameplatesSize, cl_nameplates_size, 50, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Size of the nameplates from 0 to 100%") +MACRO_CONFIG_INT(ClNameplates, cl_nameplates, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show name plates") +MACRO_CONFIG_INT(ClNameplatesAlways, cl_nameplates_always, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Always show name plates disregarding of distance") +MACRO_CONFIG_INT(ClNameplatesTeamcolors, cl_nameplates_teamcolors, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Use team colors for name plates") +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(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show ingame FPS counter") |