diff --git a/src/p_setup.c b/src/p_setup.c index dc8b1731e..3f6ed17c4 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2910,7 +2910,7 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate) globalweather = mapheaderinfo[gamemap-1]->weather; // set up world state - P_SpawnSpecials(fromnetsave); + P_SpawnSpecials(fromnetsave, reloadinggamestate); if (loadprecip) // ugly hack for P_NetUnArchiveMisc (and P_LoadNetGame) P_SpawnPrecipitation(); diff --git a/src/p_spec.c b/src/p_spec.c index c022ef384..0fbddd085 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5236,7 +5236,7 @@ static void P_RunLevelLoadExecutors(void) * as they'll just be erased by UnArchiveThinkers. * \sa P_SpawnPrecipitation, P_SpawnFriction, P_SpawnPushers, P_SpawnScrollers */ -void P_SpawnSpecials(INT32 fromnetsave) +void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) { sector_t *sector; size_t i; @@ -6263,7 +6263,8 @@ void P_SpawnSpecials(INT32 fromnetsave) } } - P_RunLevelLoadExecutors(); + if (!reloadinggamestate) + P_RunLevelLoadExecutors(); } /** Adds 3Dfloors as appropriate based on a common control linedef. diff --git a/src/p_spec.h b/src/p_spec.h index 1231aeda8..477dd4950 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -32,7 +32,7 @@ void P_InitPicAnims(void); void P_SetupLevelFlatAnims(void); // at map load -void P_SpawnSpecials(INT32 fromnetsave); +void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate); // every tic void P_UpdateSpecials(void);