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

[kirben at users.sourceforge.net]

Revision: 21619
Author:   kirben
Date:     2006-04-04 17:11:17 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21619&view=rev

Log Message:
-----------
Fix regression in Simon2, a byte was lost when clearing or setting marks

Modified Paths:
--------------
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-04 23:57:56 UTC (rev 21618)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-05 00:11:17 UTC (rev 21619)
@@ -2266,25 +2266,11 @@
 }
 
 void SimonEngine::vc73_setMark() {
-	uint16 bit;
-
-	if (getGameType() == GType_FF)
-		bit = vcReadNextWord();
-	else
-		bit = vcReadNextByte();
-
-	_marks |= 1 << bit;
+	_marks |= (1 << vcReadNextWord());
 }
 
 void SimonEngine::vc74_clearMark() {
-	uint16 bit;
-
-	if (getGameType() == GType_FF)
-		bit = vcReadNextWord();
-	else
-		bit = vcReadNextByte();
-
-	_marks &= ~(1 << bit);
+	_marks &= ~(1 << vcReadNextWord());
 }
 
 int SimonEngine::getScale(int y, int x) {


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