aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2002-12-19 14:34:26 +0000
committerTravis Howell2002-12-19 14:34:26 +0000
commitf1ee93b898e88de2948b0cb754be85f196ca23dd (patch)
tree84c06e0f44d84a31ef637affc9340d716555b15e
parente9cb26cacf63bccdbe9d3d4f7da0170a271c1dfd (diff)
downloadscummvm-rg350-f1ee93b898e88de2948b0cb754be85f196ca23dd.tar.gz
scummvm-rg350-f1ee93b898e88de2948b0cb754be85f196ca23dd.tar.bz2
scummvm-rg350-f1ee93b898e88de2948b0cb754be85f196ca23dd.zip
Add missing code
svn-id: r6024
-rw-r--r--simon/simon.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 51481f267a..d046ca41d6 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2647,7 +2647,9 @@ void SimonState::timer_proc1()
{
_timer_4++;
- if (_lock_word & 0xC0E9 || _lock_word & 2)
+ if ((_game & GAME_SIMON2) && (_lock_word & 0x80E9 || _lock_word & 2)) {
+ return;
+ } else if (_lock_word & 0xC0E9 || _lock_word & 2)
return;
_timer_1++;