From c86d496fefb012653ec35c7b76172eda5cee0f0f Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Tue, 10 Nov 2020 23:02:58 -0500
Subject: [PATCH] Removed fixed length hit lag

---
 src/k_collide.c |  2 +-
 src/k_kart.c    |  4 ++--
 src/k_kart.h    |  2 +-
 src/p_inter.c   | 14 ++++++--------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/k_collide.c b/src/k_collide.c
index 00bd9c6b3..13b17e981 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -273,7 +273,7 @@ boolean K_MineCollide(mobj_t *t1, mobj_t *t2)
 		}
 		else
 		{
-			K_SetHitLagForObjects(t1, t2, 2, true);
+			K_SetHitLagForObjects(t1, t2, 2);
 			K_PuntMine(t1, t2);
 		}
 	}
diff --git a/src/k_kart.c b/src/k_kart.c
index 0df4cacd2..8512649b3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2374,7 +2374,7 @@ angle_t K_MomentumAngle(mobj_t *mo)
 	}
 }
 
-void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed)
+void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics)
 {
 	boolean mo1valid = (mo1 && !P_MobjWasRemoved(mo1));
 	boolean mo2valid = (mo2 && !P_MobjWasRemoved(mo2));
@@ -2382,7 +2382,7 @@ void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed)
 	INT32 tics1 = tics;
 	INT32 tics2 = tics;
 
-	if (mo1valid == true && mo2valid == true && fixed == false)
+	if (mo1valid == true && mo2valid == true)
 	{
 		const fixed_t ticaddfactor = mapobjectscale * 8;
 		const INT32 mintics = tics;
diff --git a/src/k_kart.h b/src/k_kart.h
index dd390f362..408ed3303 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -40,7 +40,7 @@ void K_KartPlayerHUDUpdate(player_t *player);
 void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
 void K_KartPlayerAfterThink(player_t *player);
 angle_t K_MomentumAngle(mobj_t *mo);
-void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed);
+void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics);
 void K_DoInstashield(player_t *player);
 void K_BattleHitPlayer(player_t *player, player_t *victim, UINT8 points, boolean reducewanted);
 void K_RemoveBumper(player_t *player, mobj_t *inflictor, mobj_t *source);
diff --git a/src/p_inter.c b/src/p_inter.c
index cc6bb89e7..499ba5713 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1075,7 +1075,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 	if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
 		return;
 
-	//K_SetHitLagForObjects(target, inflictor, 15, false);
+	//K_SetHitLagForObjects(target, inflictor, 15);
 
 	// SRB2kart
 	// I wish I knew a better way to do this
@@ -1672,7 +1672,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
 			break;
 	}
 
-	K_SetHitLagForObjects(player->mo, inflictor, 15, false);
+	K_SetHitLagForObjects(player->mo, inflictor, 15);
 
 	player->pflags &= ~PF_SLIDING;
 	player->powers[pw_carry] = CR_NONE;
@@ -1759,8 +1759,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	player_t *player;
 	boolean force = false;
 
-	INT32 laglength = 2;
-	boolean lagfixed = true;
+	INT32 laglength = 3;
 
 	if (objectplacing)
 		return false;
@@ -1778,7 +1777,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	if ((damagetype & DMG_TYPEMASK) != DMG_NORMAL && (damagetype & DMG_TYPEMASK) != DMG_STING)
 	{
 		laglength = 10;
-		lagfixed = false;
 	}
 
 	// Everything above here can't be forced.
@@ -1953,7 +1951,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			}
 
 			player->kartstuff[k_instashield] = 15;
-			K_SetHitLagForObjects(target, inflictor, laglength, lagfixed);
+			K_SetHitLagForObjects(target, inflictor, laglength);
 			return true;
 		}
 	}
@@ -1975,7 +1973,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	if (source && source->player && target)
 		G_GhostAddHit((INT32) (source->player - players), target);
 
-	K_SetHitLagForObjects(target, inflictor, laglength, lagfixed);
+	K_SetHitLagForObjects(target, inflictor, laglength);
 
 	if (target->health <= 0)
 	{
@@ -1983,7 +1981,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 		return true;
 	}
 
-	//K_SetHitLagForObjects(target, inflictor, laglength, lagfixed);
+	//K_SetHitLagForObjects(target, inflictor, laglength);
 
 	if (player)
 		P_ResetPlayer(target->player);