From 781b1a07a89877211c5227a4333196dc33d505db Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sun, 12 Oct 2025 18:25:16 -0500 Subject: [PATCH] Revert "Merge branch 'jawz-adjustments' into 'master'" This reverts commit 73ff24ff1b70e1a51f4a0a5cec84370f68d6854c, reversing changes made to 40968abdc35aa7aec4749d18c9b6e0282c53d0b6. --- src/objects/jawz.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/objects/jawz.c b/src/objects/jawz.c index 1d91f5550..41aab4c7a 100644 --- a/src/objects/jawz.c +++ b/src/objects/jawz.c @@ -75,7 +75,7 @@ static void JawzChase(mobj_t *th, boolean grounded) fixed_t speeddifference = abs( topspeed - min( jawz_chase(th)->player->speed, - (K_GetKartSpeed(jawz_chase(th)->player, false, false))/2 + K_GetKartSpeed(jawz_chase(th)->player, false, false) ) ); @@ -279,16 +279,8 @@ void Obj_JawzThrown(mobj_t *th, fixed_t finalSpeed, fixed_t dir) th->momx = 0; th->momy = 0; - // Return at absolutely 120% of the owner's speed if it's any less than that. - fixed_t min_backthrowspeed = 6*(K_GetKartSpeed(owner, false, false))/5; - if (owner->speed >= min_backthrowspeed) - { - finalSpeed = 6*(owner->speed)/5; - } - else - { - finalSpeed = min_backthrowspeed; - } + // Slow down the top speed. + finalSpeed = FixedMul(finalSpeed, 4*FRACUNIT/5); // Set a fuse. th->fuse = RR_PROJECTILE_FUSE;