Fixed PowerMorph setting wrong Owner

Boondorl · Boondorl · commit 3a2784e9a41d · 2024-04-17T19:55:30.000-04:00
Also sets default flash effects.
diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs
@@ -1884,6 +1884,8 @@ class PowerMorph : Powerup
 	Default
 	{
 		Powerup.Duration -40;
+		PowerMorph.MorphFlash "TeleportFog";
+		PowerMorph.UnmorphFlash "TeleportFog";
 	}
 	
 	//===========================================================================
@@ -1901,8 +1903,6 @@ class PowerMorph : Powerup
 
 		if (Owner.Morph(Owner, PlayerClass, MonsterClass, int.max, MorphStyle, MorphFlash, UnmorphFlash))
 		{
-			// Get the real owner; safe because we are not attached to anything yet.
-			Owner = Owner.Alternative;
 			bCreateCopyMoved = true;	// Let the caller know the "real" owner has changed (to the morphed actor).
 			MorphedPlayer = Owner.player;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1884,6 +1884,8 @@ class PowerMorph : Powerup`
`1884`	`1884`	`Default`
`1885`	`1885`	`{`
`1886`	`1886`	`Powerup.Duration -40;`
	`1887`	`+ PowerMorph.MorphFlash "TeleportFog";`
	`1888`	`+ PowerMorph.UnmorphFlash "TeleportFog";`
`1887`	`1889`	`}`
`1888`	`1890`
`1889`	`1891`	`//===========================================================================`
`@@ -1901,8 +1903,6 @@ class PowerMorph : Powerup`
`1901`	`1903`
`1902`	`1904`	`if (Owner.Morph(Owner, PlayerClass, MonsterClass, int.max, MorphStyle, MorphFlash, UnmorphFlash))`
`1903`	`1905`	`{`
`1904`		`- // Get the real owner; safe because we are not attached to anything yet.`
`1905`		`- Owner = Owner.Alternative;`
`1906`	`1906`	`bCreateCopyMoved = true; // Let the caller know the "real" owner has changed (to the morphed actor).`
`1907`	`1907`	`MorphedPlayer = Owner.player;`
`1908`	`1908`	`}`