thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-25 19:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
MysterD 2020-09-08 14:03:12 -07:00
parent 1e46ed136a
commit d1873328a4
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;