Implement more of InGameUI (#1064)

TheAssemblyArmada · Jan 30, 2024 · eff5c4e · eff5c4e
1 parent 0524e8b
commit eff5c4e
Show file tree

Hide file tree

Showing 11 changed files with 1,325 additions and 33 deletions.
diff --git a/src/game/client/globallanguage.cpp b/src/game/client/globallanguage.cpp
@@ -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);
 }

diff --git a/src/game/client/globallanguage.h b/src/game/client/globallanguage.h
@@ -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);