diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2025-08-13 21:08:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-13 12:08:32 -0700 |
| commit | 7b4df9bdb2ebde2bdd6581c10ffdc1aea4ee1573 (patch) | |
| tree | 6c805ed37b7a34523a9e47a5d620604da8ef5ec5 /soh/src/code | |
| parent | fadae4997740d6073d6ce01db2950c8a24b3cbb0 (diff) | |
Boss Rush cleanup (#5652)
* Reduce stuff in the `.h`s & use `COND_HOOK` + variants
* Move some boss rush stuff from `z_file_choose.c`
* clang
* Update BossRush.cpp
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_parameter.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 0fc923070..f2713c8d6 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -8,7 +8,6 @@ #include "libultraship/bridge.h" #include "soh/Enhancements/gameplaystats.h" -#include "soh/Enhancements/boss-rush/BossRushTypes.h" #include "soh/Enhancements/custom-message/CustomMessageInterfaceAddon.h" #include "soh/Enhancements/cosmetics/cosmeticsTypes.h" #include "soh/Enhancements/enhancementTypes.h" @@ -6374,11 +6373,10 @@ void Interface_Draw(PlayState* play) { void Interface_DrawTotalGameplayTimer(PlayState* play) { // Draw timer based on the Gameplay Stats total time. - - if ((IS_BOSS_RUSH && gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_TIMER] == BR_CHOICE_TIMER_YES) || - (CVarGetInteger(CVAR_GAMEPLAY_STATS("ShowIngameTimer"), 0) && gSaveContext.fileNum >= 0 && - gSaveContext.fileNum <= 2)) { - + if (GameInteractor_Should(VB_SHOW_GAMEPLAY_TIMER, + CVarGetInteger(CVAR_GAMEPLAY_STATS("ShowIngameTimer"), 0) && gSaveContext.fileNum >= 0 && + gSaveContext.fileNum <= 2, + play)) { s32 X_Margins_Timer = 0; if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.UseMargins"), 0) != 0) { if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosType"), 0) == ORIGINAL_LOCATION) { |