mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-31 10:10:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when dying during remote bombchu (#7108)

Browse Source
This commit is contained in:
Philip Dubé
2026-08-30 01:38:31 +00:00
committed by GitHub
parent a5a1826185
commit 6694b56445
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/Items/RemoteBombchu.cpp
+15 -1
View File
@@ -75,7 +75,9 @@ static void StopControl(PlayState* play) {
}
Player* player = GET_PLAYER(play);
player->stateFlags1 &= ~PLAYER_STATE1_INPUT_DISABLED;
if (player != NULL) {
player->stateFlags1 &= ~PLAYER_STATE1_INPUT_DISABLED;
}
sState.activeChu = nullptr;
sState.isActive = false;
@@ -171,6 +173,12 @@ static void OnActorDestroy(void* refActor) {
}
}
// Scene teardown deletes player before bombchu, stop while everything valid
static void OnPlayDestroy() {
StopControl(gPlayState);
sState.activeChu = nullptr;
}
// Main update logic
static void OnActorUpdate(void* refActor) {
if (refActor != sState.activeChu)
@@ -198,6 +206,12 @@ static void OnActorUpdate(void* refActor) {
}
void RegisterRemoteBombchu() {
// Turning off mid-flight would drop hooks with disabled input
if (!CVAR_REMOTE_BOMBCHU_VALUE && sState.isActive) {
StopControl(gPlayState);
}
COND_HOOK(OnPlayDestroy, true, OnPlayDestroy);
COND_ID_HOOK(OnActorInit, ACTOR_EN_BOM_CHU, CVAR_REMOTE_BOMBCHU_VALUE, OnActorInit);
COND_ID_HOOK(OnActorDestroy, ACTOR_EN_BOM_CHU, CVAR_REMOTE_BOMBCHU_VALUE, OnActorDestroy);
COND_ID_HOOK(OnActorUpdate, ACTOR_EN_BOM_CHU, CVAR_REMOTE_BOMBCHU_VALUE, OnActorUpdate);