From adf6579b3782eeb9b76b894321dade41699e70ef Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 23 Sep 2006 20:14:06 +0000
Subject: [PATCH] - Fixed: Starting a new game didn't remove the deferred
 scripts.

SVN r337 (trunk)
---
 docs/rh-log.txt | 3 +++
 src/g_level.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index e6e626f05..dcaed3d00 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+September 23, 2006 (Changes by Graf Zahl)
+- Fixed: Starting a new game didn't remove the deferred scripts.
+
 September 22, 2006
 - Fixed: FNodeBuilder::ShoveSegBehind needs to check that the result from
   Heuristic is positive, not just non-zero.
diff --git a/src/g_level.cpp b/src/g_level.cpp
index e2b28177f..6fbef2b51 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1403,12 +1403,12 @@ void G_InitNew (char *mapname, bool bTitleLevel)
 	bool wantFast;
 	int i;
 
-	if (!savegamerestore)
-		G_ClearSnapshots ();
-
-	// [RH] Mark all levels as not visited
 	if (!savegamerestore)
 	{
+		G_ClearSnapshots ();
+		P_RemoveDefereds ();
+
+		// [RH] Mark all levels as not visited
 		for (unsigned int i = 0; i < wadlevelinfos.Size(); i++)
 			wadlevelinfos[i].flags = wadlevelinfos[i].flags & ~LEVEL_VISITED;
 	}