aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-04-05 00:11:17 +0000
committerTravis Howell2006-04-05 00:11:17 +0000
commitfba527651f13bfbd3907ff4520209aa800319ae8 (patch)
tree088c44049434cee6aa951b1bf2373934850a62cc
parentd7dd5ad9d9f9e360ef686f51fe483d808026b22d (diff)
downloadscummvm-rg350-fba527651f13bfbd3907ff4520209aa800319ae8.tar.gz
scummvm-rg350-fba527651f13bfbd3907ff4520209aa800319ae8.tar.bz2
scummvm-rg350-fba527651f13bfbd3907ff4520209aa800319ae8.zip
Fix regression in Simon2, a byte was lost when clearing or setting marks
svn-id: r21619
-rw-r--r--engines/simon/vga.cpp18
1 files changed, 2 insertions, 16 deletions
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) {