From 7c527de37464d7297992c9daa3a183671f2700cc Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 15 Jul 2018 10:57:10 +0200
Subject: [PATCH] - call P_PlayerStartStomp only when the map is played
 directly from the loaded data and only when it has been fully loaded.

The old code did this right in the middle of map initialization where not everything had been set up yet.
---
 src/g_level.cpp | 10 ++++++++++
 src/p_setup.cpp |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/g_level.cpp b/src/g_level.cpp
index 5997e489eed..207a3682abf 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1045,6 +1045,16 @@ void G_DoLoadLevel (int position, bool autosave)
 
 	G_UnSnapshotLevel (!savegamerestore);	// [RH] Restore the state of the level.
 	int pnumerr = G_FinishTravel ();
+
+	if (!level.FromSnapshot)
+	{
+		for (int i = 0; i<MAXPLAYERS; i++)
+		{
+			if (playeringame[i] && players[i].mo != NULL)
+				P_PlayerStartStomp(players[i].mo);
+		}
+	}
+
 	// For each player, if they are viewing through a player, make sure it is themselves.
 	for (int ii = 0; ii < MAXPLAYERS; ++ii)
 	{
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 893547bfb1d..db5baf51869 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1845,11 +1845,6 @@ void P_SpawnThings (int position)
 			SetMapThingUserData(actor, *udi);
 		}
 	}
-	for(int i=0; i<MAXPLAYERS; i++)
-	{
-		if (playeringame[i] && players[i].mo != NULL)
-			P_PlayerStartStomp(players[i].mo);
-	}
 }