From f1006ece347ee264180312de48749b08ca738155 Mon Sep 17 00:00:00 2001
From: Neon <talktoneon726@gmail.com>
Date: Tue, 21 Jan 2025 01:31:57 +0000
Subject: [PATCH] Spawn Torchflower's flame after the original object is scaled
from a mapthing
---
src/p_mobj.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index b377ff82f4..05249ea882 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11012,13 +11012,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, ...)
mcsolid->angle = mobj->angle + ANGLE_90;
}
break;
- case MT_TORCHFLOWER:
- {
- mobj_t *fire = P_SpawnMobjFromMobj(mobj, 0, 0, 46*FRACUNIT, MT_FLAME);
- if (!P_MobjWasRemoved(fire))
- P_SetTarget(&mobj->target, fire);
- break;
- }
case MT_PYREFLY:
mobj->extravalue1 = (FixedHypot(mobj->x, mobj->y)/FRACUNIT) % 360;
mobj->extravalue2 = 0;
@@ -13012,6 +13005,13 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
}
}
break;
+ case MT_TORCHFLOWER:
+ {
+ mobj_t *fire = P_SpawnMobjFromMobj(mobj, 0, 0, 46*FRACUNIT, MT_FLAME);
+ if (!P_MobjWasRemoved(fire))
+ P_SetTarget(&mobj->target, fire);
+ break;
+ }
case MT_CANDLE:
case MT_CANDLEPRICKET:
if (mthing->args[0])
--
GitLab