merge with trunk

svn-id: r42574

1 files changed, 6 insertions, 7 deletions

diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp
index 50e6587d90..003a335e42 100644
--- a/engines/cruise/gfxModule.cpp
+++ b/engines/cruise/gfxModule.cpp
@@ -40,7 +40,6 @@ palEntry lpalette[256];
 
 int palDirtyMin = 256;
 int palDirtyMax = -1;
-bool isBlack = false;
 
 gfxModuleDataStruct gfxModuleData = {
 	0,			// use Tandy
@@ -218,6 +217,12 @@ void gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, i
 	}
 }
 
+void gfxModuleData_Init(void) {
+	memset(globalScreen, 0, 320 * 200);
+	memset(page00, 0, 320 * 200);
+	memset(page10, 0, 320 * 200);
+}
+
 void gfxModuleData_flipScreen(void) {
 	memcpy(globalScreen, gfxModuleData.pPage00, 320 * 200);
 
@@ -238,12 +243,6 @@ void flip() {
 		g_system->setPalette(paletteRGBA + palDirtyMin*4, palDirtyMin, palDirtyMax - palDirtyMin + 1);
 		palDirtyMin = 256;
 		palDirtyMax = -1;
-
-		isBlack = true;
-		for (i = 0; i < 256; ++i) {
-			isBlack = (lpalette[i].R == 0) && (lpalette[i].G == 0) && (lpalette[i].B == 0);
-			if (!isBlack) break;
-		}
 	}
 
 	g_system->copyRectToScreen(globalScreen, 320, 0, 0, 320, 200);