From fba527651f13bfbd3907ff4520209aa800319ae8 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 5 Apr 2006 00:11:17 +0000
Subject: Fix regression in Simon2, a byte was lost when clearing or setting
 marks

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

(limited to 'engines')

diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index 5ff6281663..e026223b17 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -2266,25 +2266,11 @@ void SimonEngine::vc72_play_track_2() {
 }
 
 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) {
-- 
cgit v1.2.3