Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented rare unlocking door crash

This commit is contained in:
MysterD 2020-09-19 16:19:47 -07:00
parent 55e4ce34fb
commit 9928662f2c
2 changed files with 2 additions and 4803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4803
compilelog.txt
View File

File diff suppressed because one or more lines are too long

2
src/game/interaction.c
View File

@ -1027,6 +1027,7 @@ u32 interact_warp_door(struct MarioState *m, UNUSED u32 interactType, struct Obj
}
u32 get_door_save_file_flag(struct Object *door) {
if (door == NULL) { return 0; }
u32 saveFileFlag = 0;
s16 requiredNumStars = door->oBehParams >> 24;
@ -1067,6 +1068,7 @@ u32 get_door_save_file_flag(struct Object *door) {
}
u32 interact_door(struct MarioState *m, UNUSED u32 interactType, struct Object *o) {
if (m->playerIndex != 0 && o == NULL) { return FALSE; }
s16 requiredNumStars = o->oBehParams >> 24;
s16 numStars = save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1);