mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-02-26 15:31:03 +00:00
Revert "Merge branch 'jawz-adjustments' into 'master'"
This reverts commit73ff24ff1b, reversing changes made to40968abdc3.
This commit is contained in:
parent
73ff24ff1b
commit
781b1a07a8
1 changed files with 3 additions and 11 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue