From fe1b4d220085e5838ff193e13e6ae2c7d194c1c9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 3 Oct 2010 18:34:31 +0000
Subject: [PATCH] - Heretic underwater pic working - fixed issues with
 destroying intermission screens.

SVN r2889 (finale)
---
 src/intermission/intermission.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp
index d313f5553a..9ff03f9f32 100644
--- a/src/intermission/intermission.cpp
+++ b/src/intermission/intermission.cpp
@@ -182,8 +182,10 @@ void DIntermissionScreen::Destroy()
 			palette[i] = GPalette.BaseColors[i];
 		}
 		screen->UpdatePalette ();
-		NoWipe = 0;
+		NoWipe = 5;
+		mPaletteChanged = false;
 	}
+	Super::Destroy();
 }
 
 //==========================================================================
@@ -443,7 +445,7 @@ bool DIntermissionController::NextPage ()
 	FTextureID bg;
 	bool fill = false;
 
-	if (mIndex == (int)mDesc->mActions.Size()-1 && mDesc->mLink == NAME_None)
+	if (mIndex == (int)mDesc->mActions.Size() && mDesc->mLink == NAME_None)
 	{
 		// last page
 		return false;
@@ -537,6 +539,7 @@ void DIntermissionController::Destroy ()
 	Super::Destroy();
 	if (mDeleteDesc) delete mDesc;
 	mDesc = NULL;
+	if (CurrentIntermission == this) CurrentIntermission = NULL;
 }