diff options
| author | Travis Howell | 2003-07-31 01:59:31 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-31 01:59:31 +0000 |
| commit | fc5d38ec50aca76ca4346934330b200f062e305d (patch) | |
| tree | ce4596f0a5d18ad04a6fc49e4380f6e7043a30e1 /simon | |
| parent | 847c7025009c3fb394d5177dda453d97aca13295 (diff) | |
| download | scummvm-rg350-fc5d38ec50aca76ca4346934330b200f062e305d.tar.gz scummvm-rg350-fc5d38ec50aca76ca4346934330b200f062e305d.tar.bz2 scummvm-rg350-fc5d38ec50aca76ca4346934330b200f062e305d.zip | |
Small cleanup
svn-id: r9316
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index dad89ce94a..b24da6cb6f 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2935,12 +2935,11 @@ void SimonEngine::timer_proc1() { if (_game & GF_SIMON2) { if (_lock_word & 0x80E9 || _lock_word & 2) - return; - } else if (_game & GF_TALKIE) { + return; + } else { if (_lock_word & 0xC0E9 || _lock_word & 2) - return; - } else if (_lock_word & 0x8000 || _lock_word & 0xE9 || _lock_word & 2) - return; + return; + } _timer_1++; @@ -2957,7 +2956,6 @@ void SimonEngine::timer_proc1() { } else { _sync_flag_2 ^= 1; - if (!_sync_flag_2) expire_vga_timers(); @@ -2969,7 +2967,6 @@ void SimonEngine::timer_proc1() { } } - // XXX: more stuff here timer_vga_sprites(); if (_draw_images_debug) timer_vga_sprites_2(); |