From d8aaf8552caeb42c3e5f010d5bc7c72d24b5780b Mon Sep 17 00:00:00 2001
From: NepDisk <16447892+NepDisk@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:10:05 -0400
Subject: [PATCH] Use mapobjectscale instead of FRACUNIT for droptarget
 pushback code

This makes it so droptarget knockback is the same regardless of mapscale, this also makes the item more fair and less annoying to go up against

Also remove the scaling effect from it as it was bugged and looked goofy
---
 src/k_collide.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/k_collide.c b/src/k_collide.c
index 28d966528..bae8c1aca 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -2,6 +2,7 @@
 /// \brief SRB2Kart item collision hooks
 
 #include "k_collide.h"
+#include "doomstat.h"
 #include "doomtype.h"
 #include "p_mobj.h"
 #include "k_kart.h"
@@ -525,7 +526,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) ? 35*mapobjectscale : 20*mapobjectscale);
 
 	if (draggeddroptarget)
 	{
@@ -551,7 +552,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)/mapobjectscale;
 		if (t1->reactiontime < 10)
 			t1->reactiontime = 10;
 		t1->threshold = 10;
@@ -604,9 +605,6 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
 		: SKINCOLOR_CRIMSON;
 	t1->flags &= ~MF_SHOOTABLE;
 
-	t1->spritexscale = 3*FRACUNIT;
-	t1->spriteyscale = 3*FRACUNIT/2;
-
 	if (!t2->player)
 	{
 		t2->angle += ANGLE_180;