Merge http://github.com/coelckers/gzdoom

2016-09-22 05:23:02 -04:00 · 2016-09-22 05:23:02 -04:00 · 2a9e97688d
commit 2a9e97688d
parent eeb4cbdfbc 18ee6353fa
53 changed files with 753 additions and 103 deletions
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@ -1291,6 +1291,9 @@ void G_FinishTravel ()
 		if (level.FromSnapshot)
 		{
 			FBehavior::StaticStartTypedScripts (SCRIPT_Return, pawn, true);
+
+			// [Nash] run REOPEN scripts upon map re-entry
+			FBehavior::StaticStartTypedScripts(SCRIPT_Reopen, NULL, false);
 		}
 	}