From 6d44eb8016c66e93ae336f04cd449af57ca07240 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Mon, 5 Dec 2022 17:22:01 -0600
Subject: [PATCH] Revert previous RemoveMobjInterpolator move

Matching Ring Racers. Previous move was actually a mistake on the Kart
port. Done so there is never a condition where the interpolator isn't
removed.
---
 src/p_mobj.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index bc3e6327e..49c438b3f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11147,13 +11147,14 @@ void P_RemoveMobj(mobj_t *mobj)
 	memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t));
 #endif
 
+	R_RemoveMobjInterpolator(mobj);
+
 	// free block
 	if (!mobj->thinker.next)
 	{ // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through!
 		INT32 prevreferences;
 		if (!mobj->thinker.references)
 		{
-			R_RemoveMobjInterpolator(mobj);
 			Z_Free(mobj); // No refrrences? Can be removed immediately! :D
 			return;
 		}
@@ -11164,8 +11165,6 @@ void P_RemoveMobj(mobj_t *mobj)
 	}
 
 	P_RemoveThinker((thinker_t *)mobj);
-
-	R_RemoveMobjInterpolator(mobj);
 }
 
 // This does not need to be added to Lua.