From c50e63ccd7750cb89a62bd1e0576c945619ef491 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 13 Jun 2023 14:40:11 -0700
Subject: [PATCH] p_mobj.c: add P_InstaScale function

Previously was in objects/broly.c
---
 src/objects/broly.c |  7 -------
 src/p_mobj.c        | 11 +++++++++++
 src/p_mobj.h        |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/objects/broly.c b/src/objects/broly.c
index 4c283a175..d8e2c8ffd 100644
--- a/src/objects/broly.c
+++ b/src/objects/broly.c
@@ -6,13 +6,6 @@
 #include "../p_local.h"
 #include "../s_sound.h"
 
-// TODO: generic function
-static void P_InstaScale(mobj_t *thing, fixed_t scale)
-{
-	P_SetScale(thing, scale);
-	thing->destscale = scale;
-}
-
 /* An object may not be visible on the same tic:
    1) that it spawned
    2) that it cycles to the next state */
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 62546514b..6f9006b84 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4954,6 +4954,17 @@ void P_SetScale(mobj_t *mobj, fixed_t newscale)
 	}
 }
 
+//
+// P_InstaScale
+//
+// Set the object's current scale and destscale together
+//
+void P_InstaScale(mobj_t *thing, fixed_t scale)
+{
+	P_SetScale(thing, scale);
+	thing->destscale = scale;
+}
+
 void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on your target
 {
 	fixed_t dist, ndist, speedmul;
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 0387fdc16..94c1b3915 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -548,6 +548,7 @@ boolean P_PrecipThinker(precipmobj_t *mobj);
 void P_NullPrecipThinker(precipmobj_t *mobj);
 void P_FreePrecipMobj(precipmobj_t *mobj);
 void P_SetScale(mobj_t *mobj, fixed_t newscale);
+void P_InstaScale(mobj_t *mobj, fixed_t newscale);
 void P_XYMovement(mobj_t *mo);
 void P_RingXYMovement(mobj_t *mo);
 void P_SceneryXYMovement(mobj_t *mo);