From 3fba33204cfd0ffe2601b36aa516149ef348bed9 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Mon, 30 Jun 2025 09:15:30 -0500 Subject: [PATCH] - Fixed
Morph() being called twice for monsters.

---
 wadsrc/static/zscript/actors/morph.zs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/wadsrc/static/zscript/actors/morph.zs b/wadsrc/static/zscript/actors/morph.zs
index 5ebbb59f0..a7b8c9359 100644
--- a/wadsrc/static/zscript/actors/morph.zs
+++ b/wadsrc/static/zscript/actors/morph.zs
@@ -174,9 +174,7 @@ extend class Actor
 			return false;
 		}
 
-		// [MC] Notify that we're just about to start the transfer.
-		PreMorph(morphed, false);		// False: No longer the current.
-		morphed.PreMorph(self, true);	// True: Becoming this actor.
+		// [MC] PreMorph is now called via MorphInto instead of here now.
 
 		if ((style & MRF_TRANSFERTRANSLATION) && !morphed.bDontTranslate)
 			morphed.Translation = Translation;
@@ -292,8 +290,7 @@ extend class Actor
 		if (!MorphInto(alt))
 			return false;
 
-		PreUnmorph(alt, false);
-		alt.PreUnmorph(self, true);
+		//[MC] PreUnmorph is called by MorphInto now instead of here.
 
 		// Check to see if it had a powerup that caused it to morph.
 		for (Inventory item = alt.Inv; item;)