aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-02-13 11:00:37 +0000
committerTravis Howell2004-02-13 11:00:37 +0000
commitf02f786b3f1e0c55a4d72c30ae12194e7e3d7e88 (patch)
tree31ba820f133e3443dd9204a89c4ae9baebf5d52f /simon/simon.cpp
parentadaeb61054fa9fb451da6be46fb451f5ab9c4c32 (diff)
downloadscummvm-rg350-f02f786b3f1e0c55a4d72c30ae12194e7e3d7e88.tar.gz
scummvm-rg350-f02f786b3f1e0c55a4d72c30ae12194e7e3d7e88.tar.bz2
scummvm-rg350-f02f786b3f1e0c55a4d72c30ae12194e7e3d7e88.zip
Switch warnings to debug.
Remove old commented out Simon code. svn-id: r12845
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp22
1 files changed, 5 insertions, 17 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 7e6987a102..46cf2d94a6 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -3109,24 +3109,12 @@ void SimonEngine::timer_proc1() {
_lock_word |= 2;
if (!(_lock_word & 0x10)) {
- // We currently use this section for both Simon1 and Simon2 games
- // since Simon2 section causes slow down for unknown reasons.
- //if (!(_game & GF_SIMON2)) {
+ expire_vga_timers();
+ expire_vga_timers();
+ _sync_flag_2 ^= 1;
+ _cepe_flag ^= 1;
+ if (!_cepe_flag)
expire_vga_timers();
- expire_vga_timers();
- _sync_flag_2 ^= 1;
- _cepe_flag ^= 1;
- if (!_cepe_flag)
- expire_vga_timers();
-
-/*
- } else {
- _sync_flag_2 ^= 1;
- if (!_sync_flag_2)
- expire_vga_timers();
-
- }
-*/
if (_lock_counter != 0 && !_sync_flag_2) {
_lock_word &= ~2;