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

SwitchTimerMultiplier: fix crash due to missing actor param (#5593)

Browse source
This commit is contained in:
Philip Dubé 2025-06-19 20:37:48 +00:00 • committed by GitHub
commit a9ede7d46e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
View file

@ -134,7 +134,7 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* this, PlayState* play) {
if (Flags_GetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 2)) { if (Flags_GetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 2)) {
if (this->actionFlags & 8) { if (this->actionFlags & 8) {
if (this->timer2 > 0) { if (this->timer2 > 0) {
if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, &this->timer2)) { if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer2)) {
this->timer2--; this->timer2--;
} }
} else { } else {

2
soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
View file

@ -169,7 +169,7 @@ void BgRelayObjects_DoNothing(BgRelayObjects* this, PlayState* play) {
} }
void func_808A932C(BgRelayObjects* this, PlayState* play) { void func_808A932C(BgRelayObjects* this, PlayState* play) {
if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, &this->timer)) { if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
this->timer--; this->timer--;
} }
if (this->timer == 0) { if (this->timer == 0) {