etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash in bookshelf_manager_act_2()

Browse source
This commit is contained in:
MysterD 2022-05-09 05:16:05 -07:00
parent dd6959fe90
commit 1148dd0ea0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/behaviors/flying_bookend_switch.inc.c
View file

@ -208,11 +208,13 @@ void bookshelf_manager_act_2(void) {
if (o->oTimer > 100) {
if (o->oSyncID != 0 && gSyncObjects[o->oSyncID].owned) {
o->parentObj = cur_obj_nearest_object_with_behavior(bhvHauntedBookshelf);
o->parentObj->oAction = 1;
o->oPosX = o->parentObj->oPosX;
o->oAction = 3;
network_send_object(o);
network_send_object(o->parentObj);
if (o->parentObj != NULL) {
o->parentObj->oAction = 1;
o->oPosX = o->parentObj->oPosX;
network_send_object(o->parentObj);
}
}
} else if (o->oTimer == 30) {
play_puzzle_jingle();