From 3070fb474612362aa8ee49d0f7bcd60316184d21 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Mon, 22 Apr 2024 22:57:33 -0400 Subject: [PATCH] support lus gameoverlay changes (and bump LUS) (#4067) --- libultraship | 2 +- soh/soh/OTRGlobals.cpp | 6 ++++++ soh/src/code/audio_load.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libultraship b/libultraship index 8a079ed1585..81f04fdcede 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 8a079ed15852fbd26e701fd317afc14530578a92 +Subproject commit 81f04fdcedeb5186b56b105fb0cc5cb0a478ae90 diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 48489d54241..f5d504afa45 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -320,6 +320,12 @@ OTRGlobals::OTRGlobals() { auto sohInputEditorWindow = std::make_shared("gControllerConfigurationEnabled", "Input Editor"); context->InitWindow(sohInputEditorWindow); + + auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); + overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f); + overlay->LoadFont("Fipps", "fonts/Fipps-Regular.otf", 32.0f); + overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P")); + context->InitAudio(); SPDLOG_INFO("Starting Ship of Harkinian version {}", (char*)gBuildVersion); diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 914366f91bc..cb7ba60bb88 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -632,7 +632,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { // Keep track of the previous sequence/scene so we don't repeat notifications static uint16_t previousSeqId = UINT16_MAX; static int16_t previousSceneNum = INT16_MAX; - if (CVarGetInteger("gSeqNameOverlay", 0) && + if (CVarGetInteger(CVAR_AUDIO("SeqNameOverlay"), 0) && playerIdx == SEQ_PLAYER_BGM_MAIN && (seqId != previousSeqId || (gPlayState != NULL && gPlayState->sceneNum != previousSceneNum))) { @@ -642,7 +642,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { } const char* sequenceName = AudioCollection_GetSequenceName(seqId); if (sequenceName != NULL) { - Overlay_DisplayText_Seconds(CVarGetInteger("gSeqNameOverlayDuration", 5), sequenceName); + Overlay_DisplayText_Seconds(CVarGetInteger(CVAR_AUDIO("SeqNameOverlayDuration"), 5), sequenceName); } } }