thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPC softlock (cannon and hoot)

Browse source 
Bug reported by somario360:
When trying to open the cannon in a level (so far tested in BOB & WF) the cannon dialogue will repeat infinitely. Sometimes the cannon will open, but the game will crash after.

The code I had written previously to prevent softlocks ended up causing
them due to a incorrect check of activeFlags.
This commit is contained in:
MysterD 2020-08-30 23:12:28 -07:00
parent 96a2cacf2d
commit 7b073aedb8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/mario_actions_cutscene.c
View file

@ -396,7 +396,7 @@ s32 act_reading_npc_dialog(struct MarioState *m) {
s16 angleToNPC;
if (m->playerIndex == 0) {
if (m->usedObj == NULL || m->usedObj->activeFlags != ACTIVE_FLAG_DEACTIVATED || m->usedObj->behavior != localDialogNPCBehavior) {
if (m->usedObj == NULL || m->usedObj->activeFlags == ACTIVE_FLAG_DEACTIVATED || m->usedObj->behavior != localDialogNPCBehavior) {
set_mario_npc_dialog(m, 0);
}
}