From 843397fd7b6745d0513ee6f8c3b25da52fe8d4d9 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 19 Sep 2006 12:46:34 +0000
Subject: Fix FF/Simon2 regression in last commit

svn-id: r23940
---
 engines/simon/vga.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index 8a7008dd05..bc06ab68fb 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -2144,12 +2144,7 @@ void SimonEngine::vc55_moveBox() {
 }
 
 void SimonEngine::vc56_delay() {
-	if (getGameType() == GType_SIMON2) {
-		uint16 num = vcReadVarOrWord() * _frameRate;
-
-		addVgaEvent(num + _vgaBaseDelay, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum);
-		_vcPtr = (byte *)&_vc_get_out_of_code;
-	} else if (getGameType() == GType_WW) {
+	if (getGameType() == GType_WW) {
 		byte *src = _curVgaFile2 + 32;
 		byte *dst = getBackBuf();
 
@@ -2163,14 +2158,19 @@ void SimonEngine::vc56_delay() {
 
 		_system->setPalette(palette, 0, 256);
 		memcpy(dst, src, _screenHeight * _screenWidth);
+	} else {
+		uint16 num = vcReadVarOrWord() * _frameRate;
+
+		addVgaEvent(num + _vgaBaseDelay, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum);
+		_vcPtr = (byte *)&_vc_get_out_of_code;
 	}
 }
 
 void SimonEngine::vc57_blackPalette() {
 	if (getGameType() == GType_WW) {
-		//uint8 palette[1024];
-		//memset(palette, 0, sizeof(palette));
-		//_system->setPalette(palette, 0, 256);
+		uint8 palette[1024];
+		memset(palette, 0, sizeof(palette));
+		_system->setPalette(palette, 0, 256);
 	}
 }
 
-- 
cgit v1.2.3