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

Fixed crash in bhv_animates_on_floor_switch_press_loop

This commit is contained in:
MysterD 2022-04-13 01:14:25 -07:00
parent f66530dd17
commit 9310370d61
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/behaviors/animated_floor_switch.inc.c
View File

@ -37,16 +37,18 @@ void bhv_animates_on_floor_switch_press_init(void) {
void bhv_animates_on_floor_switch_press_loop(void) { void bhv_animates_on_floor_switch_press_loop(void) {
if (o->oFloorSwitchPressAnimationUnk100 != 0) { if (o->oFloorSwitchPressAnimationUnk100 != 0) {
if (o->parentObj->oAction != 2) { if (o->parentObj != NULL && o->parentObj->oAction != 2) {
o->oFloorSwitchPressAnimationUnk100 = 0; o->oFloorSwitchPressAnimationUnk100 = 0;
} }
if (o->oFloorSwitchPressAnimationUnkFC != 0) { if (o->oFloorSwitchPressAnimationUnkFC != 0) {
o->oFloorSwitchPressAnimationUnkF4 = D_80331ACC[o->oBehParams2ndByte]; if (o->oBehParams2ndByte >= 0 && o->oBehParams2ndByte <= 2) {
o->oFloorSwitchPressAnimationUnkF4 = D_80331ACC[o->oBehParams2ndByte];
}
} else { } else {
o->oFloorSwitchPressAnimationUnkF4 = 0; o->oFloorSwitchPressAnimationUnkF4 = 0;
} }
} else if (o->parentObj->oAction == 2) { } else if (o->parentObj != NULL && o->parentObj->oAction == 2) {
o->oFloorSwitchPressAnimationUnkFC ^= 1; o->oFloorSwitchPressAnimationUnkFC ^= 1;
o->oFloorSwitchPressAnimationUnk100 = 1; o->oFloorSwitchPressAnimationUnk100 = 1;
} }
@ -70,8 +72,12 @@ void bhv_animates_on_floor_switch_press_loop(void) {
o->oFloorSwitchPressAnimationUnkFC = 1; o->oFloorSwitchPressAnimationUnkFC = 1;
} }
o->collisionData = segmented_to_virtual( u8 group = (u8)o->oBehParams2ndByte;
D_80331A54[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].unk00); u8 fType = (u8)o->oFloorSwitchPressAnimationUnkF8 / 2;
if (group <= 2 && fType <= 4) {
o->collisionData = segmented_to_virtual(
D_80331A54[group][fType].unk00);
cur_obj_set_model(D_80331A54[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].unk04); cur_obj_set_model(D_80331A54[group][fType].unk04);
}
} }