From 90d1a93f40346f869fb447e555f6df4456bd5061 Mon Sep 17 00:00:00 2001 From: Andrii Date: Sun, 30 Aug 2020 02:06:31 +0300 Subject: [PATCH] add friend nameplate marks --- src/game/client/components/nameplates.cpp | 26 ++++++++++++++++++----- src/game/variables.h | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp index 621b323f2..9f88a33cb 100644 --- a/src/game/client/components/nameplates.cpp +++ b/src/game/client/components/nameplates.cpp @@ -135,23 +135,39 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP TOutlineColor.m_A *= Alpha; TColor.m_A *= Alpha; + float YOffSet = Position.y - 38; + if(m_aNamePlates[ClientID].m_NameTextContainerIndex != -1) - TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, &TColor, &TOutlineColor, Position.x - tw / 2.0f, Position.y - FontSize - 38.0f); + { + YOffSet -= FontSize; + TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, &TColor, &TOutlineColor, Position.x - tw / 2.0f, YOffSet); + } if(g_Config.m_ClNameplatesClan) { + YOffSet -= FontSizeClan; if(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex != -1) - TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, &TColor, &TOutlineColor, Position.x - m_aNamePlates[ClientID].m_ClanNameTextWidth / 2.0f, Position.y - FontSize - FontSizeClan - 38.0f); + TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, &TColor, &TOutlineColor, Position.x - m_aNamePlates[ClientID].m_ClanNameTextWidth / 2.0f, YOffSet); + } + + if (g_Config.m_ClNameplatesFriendMark && m_pClient->m_aClients[ClientID].m_Friend) + { + YOffSet -= FontSize; + char aBuf[128]; + str_format(aBuf, sizeof(aBuf),"[F]"); + float XOffSet = TextRender()->TextWidth(0, FontSize, aBuf, -1, -1.0f)/2.0f; + TextRender()->TextColor(rgb); + TextRender()->Text(0, Position.x-XOffSet, YOffSet, FontSize, aBuf, -1.0f); } if(g_Config.m_Debug || g_Config.m_ClNameplatesIDs) // render client id when in debug as well { + YOffSet -= FontSize; char aBuf[128]; str_format(aBuf, sizeof(aBuf),"%d", pPlayerInfo->m_ClientID); - float Offset = g_Config.m_ClNameplatesClan ? (FontSize * 2 + FontSizeClan) : (FontSize * 2); - float tw_id = TextRender()->TextWidth(0, FontSize, aBuf, -1, -1.0f); + float XOffSet = TextRender()->TextWidth(0, FontSize, aBuf, -1, -1.0f)/2.0f; TextRender()->TextColor(rgb); - TextRender()->Text(0, Position.x-tw_id/2.0f, Position.y-Offset-38.0f, 28.0f, aBuf, -1.0f); + TextRender()->Text(0, Position.x-XOffSet, YOffSet, FontSize, aBuf, -1.0f); } if(g_Config.m_ClNameplatesHA) // render health and armor in nameplate diff --git a/src/game/variables.h b/src/game/variables.h index dc15f0809..2aa1c063c 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -26,6 +26,7 @@ MACRO_CONFIG_INT(ClNameplatesIDs, cl_nameplates_ids, 0, 0, 1, CFGFLAG_CLIENT|CFG MACRO_CONFIG_INT(ClNameplatesHA, cl_nameplates_ha, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show Health and Armor in name plates") MACRO_CONFIG_INT(ClNameplatesHASize, cl_nameplates_ha_size, 50, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Size of the health and armor nameplates from 0 to 100%") MACRO_CONFIG_INT(ClNameplatesOwn, cl_nameplates_own, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show own name plate (useful for demo recording)") +MACRO_CONFIG_INT(ClNameplatesFriendMark, cl_nameplates_friendmark, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show friend mark under nameplate") MACRO_CONFIG_INT(ClTextEntities, cl_text_entities, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Render textual entity data") MACRO_CONFIG_INT(ClTextEntitiesSize, cl_text_entities_size, 100, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Size of textual entity data from 0 to 100%")