Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement more of InGameUI #1064

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Implement more of InGameUI #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game/client/globallanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void GlobalLanguage::Init()
int GlobalLanguage::Adjust_Font_Size(int size)
{
float adjustment = std::clamp(
(((g_theWriteableGlobalData->m_xResolution / 800) - 1.0f) * m_resolutionFontAdjustment) + 1.0f, 1.0f, 2.0f);
(((g_theWriteableGlobalData->m_xResolution / 800.0f) - 1.0f) * m_resolutionFontAdjustment) + 1.0f, 1.0f, 2.0f);

return GameMath::Fast_To_Int_Floor(adjustment * size);
}
Expand Down
2 changes: 2 additions & 0 deletions src/game/client/globallanguage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class GlobalLanguage : public SubsystemInterface
const FontDesc &Superweapon_Countdown_Ready_Font() const { return m_superweaponCountdownReadyFont; }
const FontDesc &Named_Timer_Countdown_Normal_Font() const { return m_namedTimerCountdownNormalFont; }
const FontDesc &Named_Timer_Countdown_Ready_Font() const { return m_namedTimerCountdownReadyFont; }
int Get_Military_Caption_Delay_MS() const { return m_militaryCaptionDelayMs; }
int Get_Military_Caption_Speed() const { return m_militaryCaptionSpeed; }

static void Parse_Language_Definition(INI *ini);
static void Parse_Font_Filename(INI *ini, void *formal, void *store, void const *user_data);
Expand Down
Loading
Loading