thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'scale-drop-target' into 'master'

Browse source 
Fix Drop Target knockback for large Drop Targets and non 1/4 scale maps

See merge request KartKrew/Kart!868
This commit is contained in:
James R 2023-01-21 20:25:35 +00:00
commit 66c2d36646
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_collide.c
View file

@ -488,7 +488,7 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
// Intensify bumps if already spinning...
P_Thrust(t1, R_PointToAngle2(t1->x, t1->y, t2->x, t2->y),
(t1->reactiontime && !draggeddroptarget) ? 35*FRACUNIT : 20*FRACUNIT);
((t1->reactiontime && !draggeddroptarget) ? 140 : 80) * t1->scale);
if (draggeddroptarget)
{
@ -514,7 +514,7 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
t1->angle = t1->old_angle = R_PointToAngle2(0, 0, t1->momx, t1->momy);
t1->reactiontime = 7*(t1speed+t2speed)/FRACUNIT;
t1->reactiontime = (7 * (t1speed + t2speed)) / (4 * t1->scale);
if (t1->reactiontime < 10)
t1->reactiontime = 10;
t1->threshold = 10;