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

Prevent bubbled players from 'dying' to quicksand again

This commit is contained in:
MysterD 2020-09-24 21:37:07 -07:00
parent 9c8a58fa5b
commit 8c1ec4beba
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_actions_cutscene.c
View File

@ -2776,6 +2776,8 @@ static s32 check_for_instant_quicksand(struct MarioState *m) {
// never kill remote marios // never kill remote marios
return FALSE; return FALSE;
} }
if (m->action == ACT_BUBBLED) { return FALSE; }
if (m->floor->type == SURFACE_INSTANT_QUICKSAND && m->action & ACT_FLAG_INVULNERABLE if (m->floor->type == SURFACE_INSTANT_QUICKSAND && m->action & ACT_FLAG_INVULNERABLE
&& m->action != ACT_QUICKSAND_DEATH) { && m->action != ACT_QUICKSAND_DEATH) {
update_mario_sound_and_camera(m); update_mario_sound_and_camera(m);