Skip to content

Commit eff5c4e

Browse files
authored
Implement more of InGameUI (#1064)
1 parent 0524e8b commit eff5c4e

File tree

11 files changed

+1325
-33
lines changed

11 files changed

+1325
-33
lines changed

src/game/client/globallanguage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void GlobalLanguage::Init()
124124
int GlobalLanguage::Adjust_Font_Size(int size)
125125
{
126126
float adjustment = std::clamp(
127-
(((g_theWriteableGlobalData->m_xResolution / 800) - 1.0f) * m_resolutionFontAdjustment) + 1.0f, 1.0f, 2.0f);
127+
(((g_theWriteableGlobalData->m_xResolution / 800.0f) - 1.0f) * m_resolutionFontAdjustment) + 1.0f, 1.0f, 2.0f);
128128

129129
return GameMath::Fast_To_Int_Floor(adjustment * size);
130130
}

src/game/client/globallanguage.h

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ class GlobalLanguage : public SubsystemInterface
7070
const FontDesc &Superweapon_Countdown_Ready_Font() const { return m_superweaponCountdownReadyFont; }
7171
const FontDesc &Named_Timer_Countdown_Normal_Font() const { return m_namedTimerCountdownNormalFont; }
7272
const FontDesc &Named_Timer_Countdown_Ready_Font() const { return m_namedTimerCountdownReadyFont; }
73+
int Get_Military_Caption_Delay_MS() const { return m_militaryCaptionDelayMs; }
74+
int Get_Military_Caption_Speed() const { return m_militaryCaptionSpeed; }
7375

7476
static void Parse_Language_Definition(INI *ini);
7577
static void Parse_Font_Filename(INI *ini, void *formal, void *store, void const *user_data);

0 commit comments

Comments
 (0)