From 5d4f7f2ad26dd3254d4caede0673f0e38d38ffe6 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Thu, 28 Apr 2022 20:39:37 -0500
Subject: [PATCH] Copy interp state in P_SpawnMobjFromMobj
---
src/p_mobj.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 10084e06b3..3fe50c34f0 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -14012,5 +14012,29 @@ mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zo
newmobj->destscale = mobj->destscale;
P_SetScale(newmobj, mobj->scale);
+
+ newmobj->old_x2 = mobj->old_x2 + xofs;
+ newmobj->old_y2 = mobj->old_y2 + yofs;
+ newmobj->old_z2 = mobj->old_z2 + yofs;
+ newmobj->old_x = mobj->old_x + xofs;
+ newmobj->old_y = mobj->old_y + yofs;
+ newmobj->old_z = mobj->old_z + yofs;
+
+ // This angle hack is needed for Lua scripts that set the angle after
+ // spawning, to avoid erroneous interpolation.
+ if (mobj->player)
+ {
+ newmobj->old_angle2 = mobj->player->old_drawangle2;
+ newmobj->old_angle = mobj->player->old_drawangle;
+ }
+ else
+ {
+ newmobj->old_angle2 = mobj->old_angle2;
+ newmobj->old_angle = mobj->old_angle;
+ }
+
+ newmobj->old_scale2 = mobj->old_scale2;
+ newmobj->old_scale = mobj->old_scale;
+
return newmobj;
}
--
GitLab