From bfc8c614a0102303f6edf02beeee65d778dae2a2 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 11 Mar 2017 17:34:05 -0500 Subject: [PATCH] - Forbade return scripts from triggering on save load. --- src/g_level.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_level.cpp b/src/g_level.cpp index 427e17278c..d64bbd081e 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -1080,7 +1080,7 @@ void G_DoLoadLevel (int position, bool autosave) } E_PlayerEntered(ii, finishstate == FINISH_SameHub); // ENTER scripts are being handled when the player gets spawned, this cannot be changed due to its effect on voodoo dolls. - if (level.FromSnapshot) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true); + if (level.FromSnapshot && !savegamerestore) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true); } }