edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use DefaultTextColor and DefaultTextOutlineColor

Browse source
This commit is contained in:
Robert Müller 2023-05-06 14:42:11 +02:00
parent 4b2ec2c202
commit 6d2e2788e2
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/client/components/hud.cpp
View file

@ -520,9 +520,7 @@ void CHud::RenderTextInfo()
TextRender()->SetRenderFlags(OldFlags); TextRender()->SetRenderFlags(OldFlags);
if(m_FPSTextContainerIndex.Valid()) if(m_FPSTextContainerIndex.Valid())
{ {
ColorRGBA TColor(1, 1, 1, 1); TextRender()->RenderTextContainer(m_FPSTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor());
ColorRGBA TOutColor(0, 0, 0, 0.3f);
TextRender()->RenderTextContainer(m_FPSTextContainerIndex, TColor, TOutColor);
} }
} }
if(g_Config.m_ClShowpred) if(g_Config.m_ClShowpred)
@ -558,7 +556,7 @@ void CHud::RenderTeambalanceWarning()
else else
TextRender()->TextColor(0.7f, 0.7f, 0.2f, 1.0f); TextRender()->TextColor(0.7f, 0.7f, 0.2f, 1.0f);
TextRender()->Text(5, 50, 6, pText, -1.0f); TextRender()->Text(5, 50, 6, pText, -1.0f);
TextRender()->TextColor(1, 1, 1, 1); TextRender()->TextColor(TextRender()->DefaultTextColor());
} }
} }
} }
@ -570,7 +568,7 @@ void CHud::RenderVoting()
Graphics()->DrawRect(-10, 60 - 2, 100 + 10 + 4 + 5, 46, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 5.0f); Graphics()->DrawRect(-10, 60 - 2, 100 + 10 + 4 + 5, 46, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 5.0f);
TextRender()->TextColor(1, 1, 1, 1); TextRender()->TextColor(TextRender()->DefaultTextColor());
CTextCursor Cursor; CTextCursor Cursor;
char aBuf[512]; char aBuf[512];
@ -1652,8 +1650,8 @@ void CHud::RenderDDRaceEffects()
auto OutlineColor = TextRender()->DefaultTextOutlineColor(); auto OutlineColor = TextRender()->DefaultTextOutlineColor();
OutlineColor.a *= Alpha; OutlineColor.a *= Alpha;
TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor); TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor);
TextRender()->TextColor(1, 1, 1, 1);
} }
TextRender()->TextColor(TextRender()->DefaultTextColor());
} }
else if(!m_ShowFinishTime && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy)) else if(!m_ShowFinishTime && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
{ {
@ -1693,8 +1691,8 @@ void CHud::RenderDDRaceEffects()
auto OutlineColor = TextRender()->DefaultTextOutlineColor(); auto OutlineColor = TextRender()->DefaultTextOutlineColor();
OutlineColor.a *= Alpha; OutlineColor.a *= Alpha;
TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor); TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor);
TextRender()->TextColor(1, 1, 1, 1);
} }
TextRender()->TextColor(TextRender()->DefaultTextColor());
} }
} }
} }