From aac9592e3108258c1ae8d24158986d0e5e3edbb5 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Tue, 6 Aug 2019 23:35:20 +0200
Subject: [PATCH] Set Fang's minimum bounce strength to 1.5 times jump strength
---
src/p_user.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/p_user.c b/src/p_user.c
index 0a338a6e71..0861398d67 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4730,6 +4730,7 @@ void P_DoAbilityBounce(player_t *player, boolean changemomz)
return;
if (changemomz)
{
+ fixed_t minmomz;
prevmomz = player->mo->momz;
if (P_MobjFlip(player->mo)*prevmomz < 0)
prevmomz = 0;
@@ -4737,7 +4738,8 @@ void P_DoAbilityBounce(player_t *player, boolean changemomz)
prevmomz /= 2;
P_DoJump(player, false);
player->pflags &= ~(PF_STARTJUMP|PF_JUMPED);
- player->mo->momz = (FixedMul(player->mo->momz, 3*FRACUNIT/2) + prevmomz)/2;
+ minmomz = FixedMul(player->mo->momz, 3*FRACUNIT/2);
+ player->mo->momz = max(minmomz, (minmomz + prevmomz)/2);
}
S_StartSound(player->mo, sfx_boingf);
P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE_LANDING);
--
GitLab