Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crash in haunted bookshelf manager

This commit is contained in:
MysterD 2022-04-13 01:30:53 -07:00
parent ab933f250e
commit 254486a39f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/behaviors/flying_bookend_switch.inc.c
View File

@ -230,12 +230,13 @@ void bookshelf_manager_act_3(void) {
if (o->parentObj == NULL || o->parentObj->behavior != bhvHauntedBookshelf) { if (o->parentObj == NULL || o->parentObj->behavior != bhvHauntedBookshelf) {
o->parentObj = cur_obj_nearest_object_with_behavior(bhvHauntedBookshelf); o->parentObj = cur_obj_nearest_object_with_behavior(bhvHauntedBookshelf);
} }
if (o->oTimer > 85) { if (o->oTimer > 85) {
if (o->oSyncID != 0 && gSyncObjects[o->oSyncID].owned) { if (o->oSyncID != 0 && gSyncObjects[o->oSyncID].owned) {
o->oAction = 4; o->oAction = 4;
network_send_object(o); network_send_object(o);
} }
} else { } else if (o->parentObj != NULL) {
o->oForwardVel = o->parentObj->oPosX - o->oPosX; o->oForwardVel = o->parentObj->oPosX - o->oPosX;
o->oPosX = o->parentObj->oPosX; o->oPosX = o->parentObj->oPosX;
} }