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

Prevent underwater bubble-popping from teleporting the player to the top

This commit is contained in:
MysterD 2020-09-08 14:03:12 -07:00
parent 9bbacb90f7
commit 7171c5f499
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/mario_actions_automatic.c
View File

@ -941,7 +941,8 @@ s32 act_bubbled(struct MarioState* m) {
m->vel[1] = 0;
m->vel[2] = 0;
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
return set_mario_action(m, ACT_IDLE, 0);
u8 underWater = (m->pos[1] < ((f32)m->waterLevel));
return set_mario_action(m, underWater ? ACT_WATER_IDLE : ACT_IDLE, 0);
}
return FALSE;