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

Prevent softlock when entering a cannon near water (Star Road)

This commit is contained in:
MysterD 2022-08-07 22:42:25 -07:00
parent 9217b799b4
commit 77313ee8fd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/mario.c
View File

@ -1291,6 +1291,7 @@ s32 transition_submerged_to_walking(struct MarioState *m) {
*/ */
s32 set_water_plunge_action(struct MarioState *m) { s32 set_water_plunge_action(struct MarioState *m) {
if (m->action == ACT_BUBBLED) { return FALSE; } if (m->action == ACT_BUBBLED) { return FALSE; }
if (m->action == ACT_IN_CANNON) { return FALSE; }
m->forwardVel = m->forwardVel / 4.0f; m->forwardVel = m->forwardVel / 4.0f;
m->vel[1] = m->vel[1] / 2.0f; m->vel[1] = m->vel[1] / 2.0f;