From 8ca0fbb322d30650f825c3b5f104aeefa788def3 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Wed, 6 Mar 2024 20:11:34 -0500 Subject: [PATCH] Allow players to bounce on non grounded players' heads --- src/game/interaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index b7bbd411d..3ddd3ab56 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1335,7 +1335,8 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2) // bounce u32 interaction = determine_interaction(m, m2->marioObj); f32 aboveFloor = m2->pos[1] - m2->floorHeight; - if ((interaction & INT_HIT_FROM_ABOVE) && (aboveFloor < 1)) { + bool aboveFloorCheck = configCoopCompatibility ? (aboveFloor < 1) : true; + if ((interaction & INT_HIT_FROM_ABOVE) && aboveFloorCheck) { m2->bounceSquishTimer = max(m2->bounceSquishTimer, 4); f32 velY;