diff --git a/src/game/interaction.c b/src/game/interaction.c index c04f343be..37ace1a82 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -674,7 +674,7 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) { if (m2->marioObj != m->interactObj) { continue; } if (m2->flags & MARIO_KICKING) { scaler = 2.0f; } else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.01f); } - else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2; hasBeenPunched = TRUE; } + else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2f; hasBeenPunched = TRUE; } if (m2->flags & MARIO_METAL_CAP) { scaler *= 1.25f; } break; } @@ -1318,8 +1318,8 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2) } u8 determine_player_damage_value(u32 interaction) { - if (interaction & (INT_GROUND_POUND | INT_TRIP)) { return 3; } - if (interaction & (INT_KICK | INT_SLIDE_KICK | INT_TWIRL)) { return 2; } + if (interaction & INT_GROUND_POUND) { return 3; } + if (interaction & (INT_KICK | INT_SLIDE_KICK | INT_TRIP | INT_TWIRL)) { return 2; } return 1; }