diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-06-18 18:23:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 18:23:06 -0400 |
| commit | 39349d851241ddae94be04fe8323489542481c57 (patch) | |
| tree | 597d618ee78cdea91a846280bf66142ff82fded5 /soh/src/code | |
| parent | d4ff05f51d909bf0908d0f6e74bb7d21757d5a7f (diff) | |
fix warp override mq mode room loads (#3019)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_play.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 24cef9426..935b8b690 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -1937,14 +1937,18 @@ void Play_InitScene(PlayState* play, s32 spawn) } void Play_SpawnScene(PlayState* play, s32 sceneNum, s32 spawn) { + uint8_t mqMode = CVarGetInteger("gBetterDebugWarpScreenMQMode", WARP_MODE_OVERRIDE_OFF); + int16_t mqModeScene = CVarGetInteger("gBetterDebugWarpScreenMQModeScene", -1); + if (mqMode != WARP_MODE_OVERRIDE_OFF && sceneNum != mqModeScene) { + CVarClear("gBetterDebugWarpScreenMQMode"); + CVarClear("gBetterDebugWarpScreenMQModeScene"); + } OTRPlay_SpawnScene(play, sceneNum, spawn); if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) { Entrance_OverrideSpawnScene(sceneNum, spawn); } - - CVarClear("gBetterDebugWarpScreenMQMode"); } void func_800C016C(PlayState* play, Vec3f* src, Vec3f* dest) { |