github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-29 19:18:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix forest temple lift softlock (#4713)

Browse source
This commit is contained in:
Pepper0ni 2024-12-18 22:01:42 +00:00 • committed by GitHub
parent f7701a73c5
commit 03e9331d7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View file

@ -893,7 +893,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
// This is a bit of a hack, we can't effectively override the behavior of the torches // This is a bit of a hack, we can't effectively override the behavior of the torches
// or poes from which the cutscene is triggered until we can have a "BeforeActorInit" hook. // or poes from which the cutscene is triggered until we can have a "BeforeActorInit" hook.
// So for now we're just going to set the flag before they get to the room the cutscene is in // So for now we're just going to set the flag before they get to the room the cutscene is in
if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B)) { if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B) && !Flags_GetSwitch(gPlayState, 0x1C)) {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), 0) && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) { if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), 0) && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
Flags_SetSwitch(gPlayState, 0x1B); Flags_SetSwitch(gPlayState, 0x1B);
} }