diff options
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 16 | ||||
| -rw-r--r-- | src/game/client/components/nameplates.cpp | 6 | ||||
| -rw-r--r-- | src/game/variables.h | 1 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index f1b701ed..e2d2fd75 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -98,13 +98,25 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView) if(DoButton_CheckBox(&g_Config.m_ClNameplates, Localize("Show name plates"), g_Config.m_ClNameplates, &Button)) g_Config.m_ClNameplates ^= 1; - //if(config.cl_nameplates) + LeftView.HSplitTop(20.0f, &Button, &LeftView); + if(g_Config.m_ClNameplates) { - LeftView.HSplitTop(20.0f, &Button, &LeftView); Button.VSplitLeft(15.0f, 0, &Button); if(DoButton_CheckBox(&g_Config.m_ClNameplatesAlways, Localize("Always show name plates"), g_Config.m_ClNameplatesAlways, &Button)) g_Config.m_ClNameplatesAlways ^= 1; + + // draw nameplates size slider + CUIRect Label; + LeftView.HSplitTop(20.0f, &Button, &LeftView); + Button.VSplitLeft(15.0f, 0, &Button); + Button.VSplitRight(10.0f, &Button, 0); + Button.VSplitLeft(140.0f, &Label, &Button); + Button.HMargin(2.0f, &Button); + UI()->DoLabel(&Label, Localize("Name plates size"), 13.0f, -1); + g_Config.m_ClNameplatesSize = (int)(DoScrollbarH(&g_Config.m_ClNameplatesSize, &Button, g_Config.m_ClNameplatesSize/100.0f)*100.0f+0.1f); } + else + LeftView.HSplitTop(20.0f, &Button, &LeftView); { const CSkins::CSkin *pOwnSkin = m_pClient->m_pSkins->Get(max(0, m_pClient->m_pSkins->Find(g_Config.m_PlayerSkin))); diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp index cdddddcb..39d081a9 100644 --- a/src/game/client/components/nameplates.cpp +++ b/src/game/client/components/nameplates.cpp @@ -20,6 +20,8 @@ void CNamePlates::RenderNameplate( vec2 Position = mix(vec2(pPrevChar->m_X, pPrevChar->m_Y), vec2(pPlayerChar->m_X, pPlayerChar->m_Y), IntraTick); + + float FontSize = 18.0f + 20.0f * g_Config.m_ClNameplatesSize / 100.0f; // render name plate if(!pPlayerInfo->m_Local) { @@ -28,7 +30,7 @@ void CNamePlates::RenderNameplate( a = clamp(1-powf(distance(m_pClient->m_pControls->m_TargetPos, Position)/200.0f,16.0f), 0.0f, 1.0f); const char *pName = m_pClient->m_aClients[pPlayerInfo->m_ClientId].m_aName; - float tw = TextRender()->TextWidth(0, 28.0f, pName, -1); + float tw = TextRender()->TextWidth(0, FontSize, pName, -1); TextRender()->TextColor(1.0f, 1.0f, 1.0f, a); if(m_pClient->m_Snap.m_pGameobj && m_pClient->m_Snap.m_pGameobj->m_Flags&GAMEFLAG_TEAMS) @@ -39,7 +41,7 @@ void CNamePlates::RenderNameplate( TextRender()->TextColor(0.7f, 0.7f, 1.0f, a); } - TextRender()->Text(0, Position.x-tw/2.0f, Position.y-60, 28.0f, pName, -1); + TextRender()->Text(0, Position.x-tw/2.0f, Position.y-FontSize-38.0f, FontSize, pName, -1); if(g_Config.m_Debug) // render client id when in debug aswell { diff --git a/src/game/variables.h b/src/game/variables.h index c41f12fb..2fc04d9d 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -9,6 +9,7 @@ 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(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") |