From c37fa42d61d9348cb53aa003fb0535ede00b5f11 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 7 Jun 2023 05:03:24 -0700 Subject: [PATCH 1/2] Fix quake tilt speed scaling varying by map scale --- src/p_user.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index a5e9df25a..587a555c2 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4011,19 +4011,20 @@ Quaketilt (player_t *player) if (sliptiding) { tilt = ANGLE_45; - lowb = 5*FRACUNIT; + lowb = 20*FRACUNIT; } else { tilt = ANGLE_11hh/2; - lowb = 15*FRACUNIT; + lowb = 60*FRACUNIT; } } else { tilt = ANGLE_22h; - lowb = 10*FRACUNIT; + lowb = 40*FRACUNIT; } + lowb = FixedMul(lowb, player->mo->scale); moma = FixedMul(FixedDiv(delta, ANGLE_90), tilt); speed = abs( player->mo->momx + player->mo->momy ); if (speed < lowb) From f3e1a19c62c40c00739b4f791285f3cfc3c741aa Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 7 Jun 2023 05:04:43 -0700 Subject: [PATCH 2/2] Quaketilt: fix jitter at certain momentum angles --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 587a555c2..8352cf332 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4026,7 +4026,7 @@ Quaketilt (player_t *player) } lowb = FixedMul(lowb, player->mo->scale); moma = FixedMul(FixedDiv(delta, ANGLE_90), tilt); - speed = abs( player->mo->momx + player->mo->momy ); + speed = player->speed; if (speed < lowb) { // ease out tilt as we slow...