From ad06a05d7b0d6f813bded3561c73e311359324de Mon Sep 17 00:00:00 2001 From: c0d3d3v Date: Sat, 21 May 2022 19:22:50 +0200 Subject: [PATCH] render allways the nameplate of a specchar --- src/game/client/components/nameplates.cpp | 35 ++++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp index bb29bcfc3..1915623f7 100644 --- a/src/game/client/components/nameplates.cpp +++ b/src/game/client/components/nameplates.cpp @@ -325,28 +325,29 @@ void CNamePlates::OnRender() continue; } - // don't render offscreen - vec2 *pRenderPos = &m_pClient->m_aClients[i].m_RenderPos; + vec2 *pRenderPos; if(m_pClient->m_aClients[i].m_SpecCharPresent) { + // Each player can also have a spec char whose nameplate is displayed independently pRenderPos = &m_pClient->m_aClients[i].m_SpecChar; + // don't render offscreen + if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1)) + { + RenderNameplatePos(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true); + } } - if(pRenderPos->x < ScreenX0 || pRenderPos->x > ScreenX1 || pRenderPos->y < ScreenY0 || pRenderPos->y > ScreenY1) + if(m_pClient->m_Snap.m_aCharacters[i].m_Active) { - continue; - } - - if(m_pClient->m_aClients[i].m_SpecCharPresent) - { - RenderNameplatePos(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true); - } - else if(m_pClient->m_Snap.m_aCharacters[i].m_Active) - { - // only render nameplates for active characters - RenderNameplate( - &m_pClient->m_Snap.m_aCharacters[i].m_Prev, - &m_pClient->m_Snap.m_aCharacters[i].m_Cur, - pInfo); + // Only render nameplates for active characters + pRenderPos = &m_pClient->m_aClients[i].m_RenderPos; + // don't render offscreen + if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1)) + { + RenderNameplate( + &m_pClient->m_Snap.m_aCharacters[i].m_Prev, + &m_pClient->m_Snap.m_aCharacters[i].m_Cur, + pInfo); + } } } }