nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix warp override mq mode room loads (#3019)

Browse Source
This commit is contained in:
Adam Bird
2023-06-18 18:23:06 -04:00
committed by GitHub
parent d4ff05f51d
commit 39349d8512
5 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/code/z_play.c
View File

@@ -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) {