mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-20 02:23:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow skipping Mweep cutscene in progress (#7349)

Browse Source
This commit is contained in:
Jordan Longstaff
2026-10-09 09:28:17 -04:00
committed by GitHub
parent c724b412b9
commit 2f9e96c7f3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipKingZoraMoveOver.cpp
+6 -1
View File
@@ -8,6 +8,7 @@ extern "C" {
s32 EnKz_FollowPath(EnKz* enKz, PlayState* play);
s32 EnKz_SetMovedPos(EnKz* enKz, PlayState* play);
void EnKz_Mweep(EnKz* enKz, PlayState* play);
void EnKz_SetupMweep(EnKz* enKz, PlayState* play);
void EnKz_Wait(EnKz* enKz, PlayState* play);
}
@@ -35,7 +36,11 @@ static void EnKz_MweepNoCutscene(EnKz* enKz, PlayState* play) {
static void EnKz_InterceptMweep(void* actorPtr) {
EnKz* enKz = (EnKz*)actorPtr;
if (enKz->actionFunc != EnKz_SetupMweep) {
if (enKz->actionFunc == EnKz_Mweep) {
Play_ChangeCameraStatus(gPlayState, enKz->gameplayCamera, CAM_STAT_ACTIVE);
Play_ClearCamera(gPlayState, enKz->cutsceneCamera);
Player_SetCsActionWithHaltedActors(gPlayState, &enKz->actor, 7);
} else if (enKz->actionFunc != EnKz_SetupMweep) {
return;
}