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

Fix crash in is_anim_past_end

Browse source
This commit is contained in:
MysterD 2022-02-21 00:00:53 -08:00
parent 21343194ff
commit db655c6746
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/mario.c
View file

@ -70,8 +70,10 @@ s32 is_anim_at_end(struct MarioState *m) {
* Checks if Mario's animation has surpassed 2 frames before its end point. * Checks if Mario's animation has surpassed 2 frames before its end point.
*/ */
s32 is_anim_past_end(struct MarioState *m) { s32 is_anim_past_end(struct MarioState *m) {
if (m == NULL || m->marioObj == NULL) { return 0; }
struct Object *o = m->marioObj; struct Object *o = m->marioObj;
if (o->header.gfx.animInfo.curAnim == NULL) { return 0; }
return o->header.gfx.animInfo.animFrame >= (o->header.gfx.animInfo.curAnim->loopEnd - 2); return o->header.gfx.animInfo.animFrame >= (o->header.gfx.animInfo.curAnim->loopEnd - 2);
} }