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

Prevented lava from taking extra lives from bubbled players

This commit is contained in:
MysterD 2020-09-24 18:32:18 -07:00
parent 61847a970d
commit 4ab4a109da
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/interaction.c
View File

@ -2041,6 +2041,7 @@ void check_death_barrier(struct MarioState *m) {
} }
void check_lava_boost(struct MarioState *m) { void check_lava_boost(struct MarioState *m) {
if (m->action == ACT_BUBBLED) { return; }
if (!(m->action & ACT_FLAG_RIDING_SHELL) && m->pos[1] < m->floorHeight + 10.0f) { if (!(m->action & ACT_FLAG_RIDING_SHELL) && m->pos[1] < m->floorHeight + 10.0f) {
if (!(m->flags & MARIO_METAL_CAP)) { if (!(m->flags & MARIO_METAL_CAP)) {
m->hurtCounter += (m->flags & MARIO_CAP_ON_HEAD) ? 12 : 18; m->hurtCounter += (m->flags & MARIO_CAP_ON_HEAD) ? 12 : 18;

4
src/game/mario_actions_airborne.c
View File

@ -372,6 +372,10 @@ u32 common_air_action_step(struct MarioState *m, u32 landAction, s32 animation,
update_air_without_turn(m); update_air_without_turn(m);
stepResult = perform_air_step(m, stepArg); stepResult = perform_air_step(m, stepArg);
if (m->action == ACT_BUBBLED && stepResult == AIR_STEP_HIT_LAVA_WALL) {
stepResult = AIR_STEP_HIT_WALL;
}
switch (stepResult) { switch (stepResult) {
case AIR_STEP_NONE: case AIR_STEP_NONE:
set_mario_animation(m, animation); set_mario_animation(m, animation);