etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 03:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow players to bounce on non grounded players' heads

Browse source
This commit is contained in:
Agent X 2024-03-06 20:11:34 -05:00
parent 8c6102d1e1
commit 8ca0fbb322
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/interaction.c
View file

@ -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;