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

Flying triple jump off players if wing cap (#344)

This commit is contained in:
Agent X 2023-04-11 18:41:41 -04:00 committed by GitHub
parent 787efc0ce8
commit d534010fb2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/interaction.c
View File

@ -1309,7 +1309,7 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2)
velY = fmax(fmin(55.0f, 15.0f + fabs(m->vel[1])), 35.0f); velY = fmax(fmin(55.0f, 15.0f + fabs(m->vel[1])), 35.0f);
} else if (m->action == ACT_DOUBLE_JUMP) { } else if (m->action == ACT_DOUBLE_JUMP) {
mario_stop_riding_and_holding(m); mario_stop_riding_and_holding(m);
set_mario_action(m, (m->specialTripleJump && m->playerIndex == 0) ? ACT_SPECIAL_TRIPLE_JUMP : ACT_TRIPLE_JUMP, 0); set_mario_action(m, (m->specialTripleJump && m->playerIndex == 0) ? ACT_SPECIAL_TRIPLE_JUMP : m->flags & MARIO_WING_CAP ? ACT_FLYING_TRIPLE_JUMP : ACT_TRIPLE_JUMP, 0);
velY = fmax(fmin(60.0f, 20.0f + fabs(m->vel[1])), 40.0f); velY = fmax(fmin(60.0f, 20.0f + fabs(m->vel[1])), 40.0f);
} else { } else {
mario_stop_riding_and_holding(m); mario_stop_riding_and_holding(m);