summaryrefslogtreecommitdiff
path: root/src/game/client/components/menus.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/client/components/menus.cpp')
-rw-r--r--src/game/client/components/menus.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index f56c9412c..b5edc5fe2 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -182,7 +182,7 @@ bool CMenus::DoButton_Menu(CButtonContainer *pBC, const char *pText, bool Checke
TextRender()->TextColor(1.0f-FadeVal, 1.0f-FadeVal, 1.0f-FadeVal, 1.0f);
TextRender()->TextSecondaryColor(0.0f+FadeVal, 0.0f+FadeVal, 0.0f+FadeVal, 0.25f);
}
- UI()->DoLabel(&Text, pText, Text.h*ms_FontmodHeight, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Text, pText, Text.h*ms_FontmodHeight, TEXTALIGN_CENTER);
if(TextFade)
{
TextRender()->TextColor(CUI::ms_DefaultTextColor);
@@ -201,7 +201,7 @@ void CMenus::DoButton_KeySelect(CButtonContainer *pBC, const char *pText, const
pRect->HMargin(1.0f, &Label);
TextRender()->TextColor(1.0f-FadeVal, 1.0f-FadeVal, 1.0f-FadeVal, 1.0f);
TextRender()->TextSecondaryColor(0.0f+FadeVal, 0.0f+FadeVal, 0.0f+FadeVal, 0.25f);
- UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight, TEXTALIGN_CENTER);
TextRender()->TextColor(CUI::ms_DefaultTextColor);
TextRender()->TextSecondaryColor(CUI::ms_DefaultTextOutlineColor);
}
@@ -218,13 +218,13 @@ bool CMenus::DoButton_MenuTabTop(CButtonContainer *pBC, const char *pText, bool
Label.HMargin((Label.h*FontFactor)/2.0f, &Label);
TextRender()->TextColor(1.0f-FadeVal, 1.0f-FadeVal, 1.0f-FadeVal, FontAlpha);
TextRender()->TextSecondaryColor(0.0f+FadeVal, 0.0f+FadeVal, 0.0f+FadeVal, 0.25f*FontAlpha);
- UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight, TEXTALIGN_CENTER);
TextRender()->TextColor(CUI::ms_DefaultTextColor);
TextRender()->TextSecondaryColor(CUI::ms_DefaultTextOutlineColor);
return UI()->DoButtonLogic(pBC, pRect);
}
-bool CMenus::DoButton_GridHeader(const void *pID, const char *pText, bool Checked, CUI::EAlignment Align, const CUIRect *pRect, int Corners)
+bool CMenus::DoButton_GridHeader(const void *pID, const char *pText, bool Checked, int Align, const CUIRect *pRect, int Corners)
{
if(Checked)
{
@@ -283,7 +283,7 @@ bool CMenus::DoButton_CheckBox(const void *pID, const char *pText, bool Checked,
Graphics()->QuadsEnd();
Label.y += 1.0f; // lame fix
- UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);
+ UI()->DoLabel(&Label, pText, Label.h*ms_FontmodHeight*0.8f, TEXTALIGN_LEFT);
if(Locked)
{
@@ -353,7 +353,7 @@ float CMenus::DoIndependentDropdownMenu(void *pID, const CUIRect *pRect, const c
// label
Label = Header;
Label.y += 2.0f;
- UI()->DoLabel(&Label, pStr, Header.h*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, pStr, Header.h*ms_FontmodHeight*0.8f, TEXTALIGN_CENTER);
if(UI()->DoButtonLogic(pID, &Header))
*pActive ^= 1;
@@ -377,10 +377,10 @@ void CMenus::DoInfoBox(const CUIRect *pRect, const char *pLabel, const char *pVa
char aBuf[32];
str_format(aBuf, sizeof(aBuf), "%s:", pLabel);
Label.y += 2.0f;
- UI()->DoLabel(&Label, aBuf, pRect->h*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, aBuf, pRect->h*ms_FontmodHeight*0.8f, TEXTALIGN_CENTER);
Value.y += 2.0f;
- UI()->DoLabel(&Value, pValue, pRect->h*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Value, pValue, pRect->h*ms_FontmodHeight*0.8f, TEXTALIGN_CENTER);
}
void CMenus::DoJoystickBar(const CUIRect *pRect, float Current, float Tolerance, bool Active)
@@ -699,7 +699,7 @@ void CMenus::RenderMenubar(CUIRect Rect)
Box.HMargin(2.0f, &Box);
TextRender()->TextColor(CUI::ms_HighlightTextColor);
TextRender()->TextSecondaryColor(CUI::ms_HighlightTextOutlineColor);
- UI()->DoLabel(&Box, Localize("Demos"), Box.h*ms_FontmodHeight, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Box, Localize("Demos"), Box.h*ms_FontmodHeight, TEXTALIGN_CENTER);
TextRender()->TextColor(CUI::ms_DefaultTextColor);
TextRender()->TextSecondaryColor(CUI::ms_DefaultTextOutlineColor);
}
@@ -763,7 +763,7 @@ void CMenus::RenderLoading(int WorkedAmount)
Rect.y += 20;
TextRender()->TextColor(CUI::ms_DefaultTextColor);
TextRender()->TextSecondaryColor(CUI::ms_DefaultTextOutlineColor);
- UI()->DoLabel(&Rect, "Teeworlds", 48.0f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Rect, "Teeworlds", 48.0f, TEXTALIGN_CENTER);
const float Percent = m_LoadCurrent/(float)m_LoadTotal;
const float Spacing = 40.0f;
@@ -783,7 +783,7 @@ void CMenus::RenderLoading(int WorkedAmount)
}
char aBuf[8];
str_format(aBuf, sizeof(aBuf), "%d%%", (int)(100*Percent));
- UI()->DoLabel(&FullBar, aBuf, 20.0f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&FullBar, aBuf, 20.0f, TEXTALIGN_CENTER);
if(Percent > 0.5f)
{
@@ -1108,7 +1108,7 @@ void CMenus::RenderMenu(CUIRect Screen)
Button.Draw(Color, 5.0f, CUIRect::CORNER_BL);
// draw non-blending X
- UI()->DoLabel(&Button, "\xE2\x9C\x95", Button.h*ms_FontmodHeight, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Button, "\xE2\x9C\x95", Button.h*ms_FontmodHeight, TEXTALIGN_CENTER);
if(UI()->DoButtonLogic(&s_QuitButton, &Button))
m_Popup = POPUP_QUIT;
@@ -1251,7 +1251,7 @@ void CMenus::RenderMenu(CUIRect Screen)
CUIRect Part;
Box.HSplitTop(ButtonHeight+5.0f, &Part, &Box);
Part.y += 3.0f;
- UI()->DoLabel(&Part, pTitle, Part.h*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Part, pTitle, Part.h*ms_FontmodHeight*0.8f, TEXTALIGN_CENTER);
// inner box
CUIRect BottomBar;
@@ -1266,15 +1266,15 @@ void CMenus::RenderMenu(CUIRect Screen)
if(m_pClient->Editor()->HasUnsavedData())
{
Box.HSplitTop(12.0f, 0, &Part);
- UI()->DoLabel(&Part, pExtraText, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_CENTER);
Part.HSplitTop(20.0f, 0, &Part);
Part.VMargin(5.0f, &Part);
- UI()->DoLabel(&Part, Localize("There's an unsaved map in the editor, you might want to save it before you quit the game."), FontSize, CUI::ALIGN_LEFT, Part.w);
+ UI()->DoLabel(&Part, Localize("There's an unsaved map in the editor, you might want to save it before you quit the game."), FontSize, TEXTALIGN_LEFT, Part.w);
}
else
{
Box.HSplitTop(27.0f, 0, &Box);
- UI()->DoLabel(&Box, pExtraText, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Box, pExtraText, FontSize, TEXTALIGN_CENTER);
}
// buttons
@@ -1295,7 +1295,7 @@ void CMenus::RenderMenu(CUIRect Screen)
CUIRect Label;
Box.HSplitTop(20.0f, &Label, &Box);
- UI()->DoLabel(&Label, pExtraText, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, pExtraText, FontSize, TEXTALIGN_CENTER);
CUIRect EditBox;
Box.HSplitTop(20.0f, &EditBox, &Box);
@@ -1368,7 +1368,7 @@ void CMenus::RenderMenu(CUIRect Screen)
Box.HSplitTop(15.f, 0, &Box);
Box.HSplitTop(ButtonHeight, &Part, &Box);
str_format(aBuf, sizeof(aBuf), "%d/%d KiB (%.1f KiB/s)", Client()->MapDownloadAmount()/1024, Client()->MapDownloadTotalsize()/1024, m_DownloadSpeed/1024.0f);
- UI()->DoLabel(&Part, aBuf, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Part, aBuf, FontSize, TEXTALIGN_CENTER);
// time left
int SecondsLeft = maximum(1, m_DownloadSpeed > 0.0f ? static_cast<int>((Client()->MapDownloadTotalsize()-Client()->MapDownloadAmount())/m_DownloadSpeed) : 1);
@@ -1383,7 +1383,7 @@ void CMenus::RenderMenu(CUIRect Screen)
}
Box.HSplitTop(SpacingH, 0, &Box);
Box.HSplitTop(ButtonHeight, &Part, &Box);
- UI()->DoLabel(&Part, aBuf, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Part, aBuf, FontSize, TEXTALIGN_CENTER);
// progress bar
Box.HSplitTop(SpacingH, 0, &Box);
@@ -1396,7 +1396,7 @@ void CMenus::RenderMenu(CUIRect Screen)
else
{
Box.HSplitTop(27.0f, 0, &Box);
- UI()->DoLabel(&Box, Client()->ServerAddress(), FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Box, Client()->ServerAddress(), FontSize, TEXTALIGN_CENTER);
}
}
else if(m_Popup == POPUP_LOADING_DEMO)
@@ -1413,7 +1413,7 @@ void CMenus::RenderMenu(CUIRect Screen)
else
{
Box.HSplitTop(27.0f, 0, &Box);
- UI()->DoLabel(&Box, m_aDemoLoadingFile, FontSize, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Box, m_aDemoLoadingFile, FontSize, TEXTALIGN_CENTER);
// wait until next frame to load the demo
m_DemoLoadingPopupRendered = true;
}
@@ -1463,7 +1463,7 @@ void CMenus::RenderMenu(CUIRect Screen)
TextRender()->TextColor(CUI::ms_HighlightTextColor);
TextRender()->TextSecondaryColor(CUI::ms_HighlightTextOutlineColor);
}
- UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, CUI::ALIGN_CENTER);
+ UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_CENTER);
if(i == OldSelected)
{
TextRender()->TextColor(CUI::ms_DefaultTextColor);
@@ -1497,7 +1497,7 @@ void CMenus::RenderMenu(CUIRect Screen)
{
Box.HSplitTop(27.0f, 0, &Box);
Box.VMargin(10.0f, &Box);
- UI()->DoLabel(&Box, pExtraText, FontSize, CUI::ALIGN_LEFT);
+ UI()->DoLabel(&Box, pExtraText, FontSize, TEXTALIGN_LEFT);
CUIRect EditBox;
Box.HSplitBottom(Box.h/2.0f, 0, &Box);
@@ -1546,7 +1546,7 @@ void CMenus::RenderMenu(CUIRect Screen)
{
Box.HSplitTop(24.0f, 0, &Box);
Box.VMargin(10.0f, &Part);
- UI()->DoLabel(&Part, pExtraText, FontSize, CUI::ALIGN_LEFT, Box.w-20.0f);
+ UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_LEFT, Box.w-20.0f);
CUIRect EditBox;
Box.HSplitBottom(Box.h/2.0f, 0, &Box);
@@ -1578,7 +1578,7 @@ void CMenus::RenderMenu(CUIRect Screen)
{
Box.HSplitTop(20.0f, 0, &Box);
Box.VMargin(10.0f, &Part);
- UI()->DoLabel(&Part, pExtraText, FontSize, CUI::ALIGN_LEFT, Box.w-20.0f);
+ UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_LEFT, Box.w-20.0f);
CUIRect EditBox;
Box.HSplitBottom(ButtonHeight*2.0f, 0, &Box);
@@ -1602,7 +1602,7 @@ void CMenus::RenderMenu(CUIRect Screen)
// message
Box.HSplitTop(27.0f, 0, &Box);
Box.VMargin(5.0f, &Part);
- UI()->DoLabel(&Part, pExtraText, FontSize, CUI::ALIGN_LEFT, Part.w);
+ UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_LEFT, Part.w);
if(m_Popup == POPUP_MESSAGE)
{
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-04 19:26:32 +0000