[Scummvm-cvs-logs] SF.net SVN: scummvm: [23940] scummvm/trunk/engines/simon/vga.cpp

[kirben at users.sourceforge.net]

Revision: 23940
          http://svn.sourceforge.net/scummvm/?rev=23940&view=rev
Author:   kirben
Date:     2006-09-19 05:46:34 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Fix FF/Simon2 regression in last commit

Modified Paths:
--------------
    scummvm/trunk/engines/simon/vga.cpp

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-09-19 11:59:13 UTC (rev 23939)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-09-19 12:46:34 UTC (rev 23940)
@@ -2144,12 +2144,7 @@
 }
 
 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 @@
 
 		_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);
 	}
 }
 


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