- Forbade return scripts from triggering on save load.

This commit is contained in:
Rachael Alexanderson 2017-03-11 17:34:05 -05:00
parent ca75777a70
commit df5b685950

View file

@ -1080,7 +1080,7 @@ void G_DoLoadLevel (int position, bool autosave)
} }
E_PlayerEntered(ii, finishstate == FINISH_SameHub); 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. // 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);
} }
} }