Revert "Improvements to death and cheat handling"

This reverts commit 3033faf.

Revert "Improved ZScript interface for morphing"

This reverts commit 6c64a44.

Revert "Further morphing clean up"

This reverts commit 12dc5c1.

Revert "Fixed inconsistencies between player and monster morphing"

This reverts commit 3073064.

Revert "Reworked Morphing"

This reverts commit 2c09a44.

- fix compile

src/g_level.cpp

@@ -1711,7 +1711,7 @@ int FLevelLocals::FinishTravel ()
 		pawn->flags2 &= ~MF2_BLASTED;
 		if (oldpawn != nullptr)
 		{
-			PlayerPointerSubstitution (oldpawn, pawn, true);
+			StaticPointerSubstitution (oldpawn, pawn);
 			oldpawn->Destroy();
 		}
 		if (pawndup != NULL)

src/g_statusbar/sbar_mugshot.cpp

@@ -479,7 +479,7 @@ FGameTexture *FMugShot::GetFace(player_t *player, const char *default_face, int
 	if (CurrentState != NULL)
 	{
 		int skin = player->userinfo.GetSkin();
-		const char *skin_face = (stateflags & FMugShot::CUSTOM) ? nullptr : (player->mo->alternative != nullptr ? (GetDefaultByType(player->MorphedPlayerClass))->NameVar(NAME_Face).GetChars() : Skins[skin].Face.GetChars());
+		const char *skin_face = (stateflags & FMugShot::CUSTOM) ? nullptr : (player->morphTics ? (GetDefaultByType(player->MorphedPlayerClass))->NameVar(NAME_Face).GetChars() : Skins[skin].Face.GetChars());
 		return CurrentState->GetCurrentFrameTexture(default_face, skin_face, level, angle);
 	}
 	return NULL;

src/m_cheat.cpp

@@ -626,13 +626,10 @@ class DSuicider : public DThinker
 		double plyrdmgfact = Pawn->DamageFactor;
 		Pawn->DamageFactor = 1.;
 		P_DamageMobj (Pawn, Pawn, Pawn, TELEFRAG_DAMAGE, NAME_Suicide);
-		if (Pawn != nullptr)
+		Pawn->DamageFactor = plyrdmgfact;
+		if (Pawn->health <= 0)
 		{
-			Pawn->DamageFactor = plyrdmgfact;
-			if (Pawn->health <= 0)
-			{
-				Pawn->flags &= ~MF_SHOOTABLE;
-			}
+			Pawn->flags &= ~MF_SHOOTABLE;
 		}
 		Destroy();
 	}

src/p_saveg.cpp

@@ -1138,7 +1138,7 @@ void FLevelLocals::UnSnapshotLevel(bool hubLoad)
 				// If this isn't the unmorphed original copy of a player, destroy it, because it's extra.
 				for (i = 0; i < MAXPLAYERS; ++i)
 				{
-					if (PlayerInGame(i) && Players[i]->mo->alternative == pawn)
+					if (PlayerInGame(i) && Players[i]->morphTics && Players[i]->mo->alternative == pawn)
 					{
 						break;
 					}

src/playsim/a_morph.cpp

@@ -37,7 +37,7 @@ bool P_MorphActor(AActor *activator, AActor *victim, PClassActor *ptype, PClassA
 
 bool P_UnmorphActor(AActor *activator, AActor *morphed, int flags, bool force)
 {
-	IFVIRTUALPTR(morphed, AActor, Unmorph)
+	IFVIRTUALPTR(morphed, AActor, UnMorph)
 	{
 		VMValue params[] = { morphed, activator, flags, force };
 		int retval;

src/playsim/a_morph.h

@@ -26,8 +26,6 @@ enum
 	MORPH_UNDOBYTIMEOUT		= 0x00001000,	// Player unmorphs once countdown expires
 	MORPH_UNDOALWAYS		= 0x00002000,	// Powerups must always unmorph, no matter what.
 	MORPH_TRANSFERTRANSLATION = 0x00004000,	// Transfer translation from the original actor to the morphed one
-	MORPH_KEEPARMOR			= 0x00008000,	// Don't lose current armor value when morphing.
-	MORPH_IGNOREINVULN		= 0x00010000,	// Completely ignore invulnerability status on players.
 
 	MORPH_STANDARDUNDOING	= MORPH_UNDOBYTOMEOFPOWER | MORPH_UNDOBYCHAOSDEVICE | MORPH_UNDOBYTIMEOUT,
 };

src/playsim/actor.h

@@ -1747,8 +1747,8 @@ struct FTranslatedLineTarget
 	bool unlinked;	// found by a trace that went through an unlinked portal.
 };
 
-void PlayerPointerSubstitution(AActor* oldPlayer, AActor* newPlayer, bool removeOld);
-int MorphPointerSubstitution(AActor* from, AActor* to);
+
+void StaticPointerSubstitution(AActor* old, AActor* notOld);
 
 #define S_FREETARGMOBJ	1
 

src/playsim/p_enemy.cpp

@@ -3139,7 +3139,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
 	PARAM_SELF_PROLOGUE(AActor);
 
 	// [RH] Vary player pain sounds depending on health (ala Quake2)
-	if (self->player && self->alternative == nullptr)
+	if (self->player && self->player->morphTics == 0)
 	{
 		const char *pain_amount;
 		FSoundID sfx_id = NO_SOUND;

src/playsim/p_interaction.cpp

@@ -313,54 +313,36 @@ EXTERN_CVAR (Int, fraglimit)
 
 void AActor::Die (AActor *source, AActor *inflictor, int dmgflags, FName MeansOfDeath)
 {
+	// Handle possible unmorph on death
 	bool wasgibbed = (health < GetGibHealth());
 
-	// Check to see if unmorph Actors need to be killed as well. Originally this was always
-	// called but that puts an unnecessary burden on the modder to determine whether it's
-	// a valid call or not.
-	if (alternative != nullptr && !(flags & MF_UNMORPHED))
 	{
 		IFVIRTUAL(AActor, MorphedDeath)
 		{
-			// Return values are no longer used to ensure things stay properly managed.
-			AActor* const realMo = alternative;
-			int morphStyle = 0;
+			AActor *realthis = NULL;
+			int realstyle = 0;
+			int realhealth = 0;
 
 			VMValue params[] = { this };
+			VMReturn returns[3];
+			returns[0].PointerAt((void**)&realthis);
+			returns[1].IntAt(&realstyle);
+			returns[2].IntAt(&realhealth);
+			VMCall(func, params, 1, returns, 3);
 
-			{
-				IFVM(Actor, GetMorphStyle)
-				{
-					VMReturn ret[] = { &morphStyle };
-					VMCall(func, params, 1, ret, 1);
-				}
-			}
-
-			VMCall(func, params, 1, nullptr, 0);
-
-			// Kill the dummy Actor if it didn't unmorph, otherwise checking the morph flags. Player pawns need
-			// to stay, otherwise they won't respawn correctly.
-			if (realMo != nullptr && !(realMo->flags6 & MF6_KILLED)
-				&& ((alternative != nullptr && player == nullptr) || (alternative == nullptr && !(morphStyle & MORPH_UNDOBYDEATHSAVES))))
+			if (realthis && !(realstyle & MORPH_UNDOBYDEATHSAVES))
 			{
 				if (wasgibbed)
 				{
-					const int realGibHealth = realMo->GetGibHealth();
-					if (realMo->health >= realGibHealth)
-						realMo->health = realGibHealth - 1; // If morphed was gibbed, so must original be (where allowed).
-				}
-				else if (realMo->health > 0)
-				{
-					realMo->health = 0;
+					int realgibhealth = realthis->GetGibHealth();
+					if (realthis->health >= realgibhealth)
+					{
+						realthis->health = realgibhealth - 1; // if morphed was gibbed, so must original be (where allowed)l
+					}
 				}
-
-				// Pass appropriate damage information along when it's confirmed to die.
-				realMo->DamageTypeReceived = DamageTypeReceived;
-				realMo->DamageType = DamageType;
-				realMo->special1 = special1;
-
-				realMo->CallDie(source, inflictor, dmgflags, MeansOfDeath);
+				realthis->CallDie(source, inflictor, dmgflags, MeansOfDeath);
 			}
+
 		}
 	}
 
@@ -476,7 +458,7 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags, FName MeansOf
 					++source->player->spreecount;
 				}
 
-				if (source->alternative != nullptr)
+				if (source->player->morphTics)
 				{ // Make a super chicken
 					source->GiveInventoryType (PClass::FindActor(NAME_PowerWeaponLevel2));
 				}
@@ -1347,7 +1329,7 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
 
 			if (damage >= player->health && !telefragDamage
 				&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
-				&& target->alternative == nullptr)
+				&& !player->morphTics)
 			{ // Try to use some inventory health
 				P_AutoUseHealth (player, damage - player->health + 1);
 			}
@@ -1481,7 +1463,7 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
 			// check for special fire damage or ice damage deaths
 			if (mod == NAME_Fire)
 			{
-				if (player && target->alternative == nullptr)
+				if (player && !player->morphTics)
 				{ // Check for flame death
 					if (!inflictor ||
 						((target->health > -50) && (damage > 25)) ||
@@ -1815,7 +1797,7 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage, bool playPain
 	}
 	if (damage >= player->health
 		&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
-		&& target->alternative == nullptr)
+		&& !player->morphTics)
 	{ // Try to use some inventory health
 		P_AutoUseHealth(player, damage - player->health+1);
 	}
@@ -1845,7 +1827,7 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage, bool playPain
 		else
 		{
 			target->special1 = damage;
-			if (player && target->alternative == nullptr)
+			if (player && !player->morphTics)
 			{ // Check for flame death
 				if ((player->poisontype == NAME_Fire) && (target->health > -50) && (damage > 25))
 				{