From a3f1767009a692d1edaa3d1f0fd29c0de455a95c Mon Sep 17 00:00:00 2001
From: Vincent Hamm <yazoo@users.sourceforge.net>
Date: Tue, 25 Dec 2007 19:32:51 +0000
Subject: [PATCH] Fix title screen regression

svn-id: r29988
---
 engines/cruise/cruise_main.cpp |  2 +-
 engines/cruise/function.cpp    |  3 ++-
 engines/cruise/mainDraw.cpp    | 12 ++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 9d00c5a5430..61bfa3f2e00 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1797,7 +1797,7 @@ void mainLoop(void) {
 				if (doFade)
 					PCFadeFlag = 0;
 
-				if (!PCFadeFlag) {
+				/*if (!PCFadeFlag)*/ {
 					mainDraw(0);
 					flipScreen();
 				}
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 9960500ebfe..d6200927320 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -547,7 +547,8 @@ int16 Op_FadeOut(void) {
 		gfxModuleData_flipScreen();
 	}
 
-	//gfxModuleData_gfxClearFrameBuffer(backgroundPtrtable[masterScreen]);
+	memset(globalScreen, 0, 320 * 200);
+	flip();
 
 	fadeFlag = 1;
 	PCFadeFlag = 1;
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 943c7954e0e..35785ae52a7 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -124,6 +124,14 @@ void fadeIn() {
 }
 
 void flipScreen(void) {
+	if(switchPal) {
+		for(unsigned long int i=0; i<256*3; i++) {
+			workpal[i] = palScreen[masterScreen][i];
+		}
+		switchPal = 0;
+		gfxModuleData_setPal256(workpal);
+	}
+
 	SWAP(gfxModuleData.pPage00, gfxModuleData.pPage10);
 
 	gfxModuleData_flipScreen();
@@ -1388,9 +1396,9 @@ void mainDraw(int16 param) {
 	int16 objZ2 = 0;
 	int16 spriteHeight;
 
-	if (PCFadeFlag) {
+	/*if (PCFadeFlag) {
 		return;
-	}
+	}*/
 
 	bgPtr = backgroundPtrtable[masterScreen];