[Scummvm-cvs-logs] SF.net SVN: scummvm: [29988] scummvm/trunk/engines/cruise

[yazoo at users.sourceforge.net]

Revision: 29988
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29988&view=rev
Author:   yazoo
Date:     2007-12-25 11:32:51 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
Fix title screen regression

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise_main.cpp
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/mainDraw.cpp

Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp	2007-12-25 18:36:08 UTC (rev 29987)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp	2007-12-25 19:32:51 UTC (rev 29988)
@@ -1797,7 +1797,7 @@
 				if (doFade)
 					PCFadeFlag = 0;
 
-				if (!PCFadeFlag) {
+				/*if (!PCFadeFlag)*/ {
 					mainDraw(0);
 					flipScreen();
 				}

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2007-12-25 18:36:08 UTC (rev 29987)
+++ scummvm/trunk/engines/cruise/function.cpp	2007-12-25 19:32:51 UTC (rev 29988)
@@ -547,7 +547,8 @@
 		gfxModuleData_flipScreen();
 	}
 
-	//gfxModuleData_gfxClearFrameBuffer(backgroundPtrtable[masterScreen]);
+	memset(globalScreen, 0, 320 * 200);
+	flip();
 
 	fadeFlag = 1;
 	PCFadeFlag = 1;

Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-25 18:36:08 UTC (rev 29987)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-25 19:32:51 UTC (rev 29988)
@@ -124,6 +124,14 @@
 }
 
 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 @@
 	int16 objZ2 = 0;
 	int16 spriteHeight;
 
-	if (PCFadeFlag) {
+	/*if (PCFadeFlag) {
 		return;
-	}
+	}*/
 
 	bgPtr = backgroundPtrtable[masterScreen];
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.