render allways the nameplate of a specchar

This commit is contained in:
c0d3d3v 2022-05-21 19:22:50 +02:00
parent c1919f24a5
commit ad06a05d7b
No known key found for this signature in database
GPG key ID: 068AF680530DFF31

View file

@ -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);
}
}
}
}