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

Fix long-standing chair crash in BBH

This commit is contained in:
MysterD 2021-08-02 19:45:13 -07:00
parent 3d067637b5
commit 4d997ba05e
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/behaviors/haunted_chair.inc.c
View File

@ -27,7 +27,6 @@ void bhv_haunted_chair_init(void) {
network_init_object_field(o, &o->oFaceAnglePitch);
network_init_object_field(o, &o->oFaceAngleRoll);
network_init_object_field(o, &o->oFaceAngleYaw);
network_init_object_field(o, &o->oHauntedChairUnk100);
network_init_object_field(o, &o->oHauntedChairUnk104);
network_init_object_field(o, &o->oHauntedChairUnkF4);
network_init_object_field(o, &o->oHauntedChairUnkF8);

1
src/game/obj_behaviors_2.c
View File

@ -511,6 +511,7 @@ static s32 obj_grow_then_shrink(f32 *scaleVel, f32 shootFireScale, f32 endScale)
static s32 oscillate_toward(s32 *value, f32 *vel, s32 target, f32 velCloseToZero, f32 accel,
f32 slowdown) {
if (value == NULL || vel == NULL) { return FALSE; }
s32 startValue = *value;
*value += (s32) *vel;