diff options
| author | Travis Howell | 2002-12-19 15:46:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-12-19 15:46:02 +0000 |
| commit | e347600e115cf6c50e9c3c56472138f6b7b8bba3 (patch) | |
| tree | db4b018344c4cce8be97fd075cc3708bc498725c /simon | |
| parent | 4811fe5bc2fde866543de5343561632adc7bbc84 (diff) | |
| download | scummvm-rg350-e347600e115cf6c50e9c3c56472138f6b7b8bba3.tar.gz scummvm-rg350-e347600e115cf6c50e9c3c56472138f6b7b8bba3.tar.bz2 scummvm-rg350-e347600e115cf6c50e9c3c56472138f6b7b8bba3.zip | |
Fix some comments and add missing variable change
svn-id: r6027
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 8 | ||||
| -rw-r--r-- | simon/vga.cpp | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 7e59465fa9..279462c26b 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2650,7 +2650,10 @@ void SimonState::timer_proc1() if (_game & GAME_SIMON2) { if (_lock_word & 0x80E9 || _lock_word & 2) return; - } else if (_lock_word & 0xC0E9 || _lock_word & 2) + } else if (_game & GAME_TALKIE) { + if (_lock_word & 0xC0E9 || _lock_word & 2) + return; + } else if (_lock_word & 0x8000 || _lock_word & 0xE9 || _lock_word & 2) return; _timer_1++; @@ -2680,6 +2683,7 @@ void SimonState::timer_proc1() } } + /* XXX: more stuff here */ timer_vga_sprites(); #ifdef DRAW_IMAGES_DEBUG timer_vga_sprites_2(); @@ -2695,10 +2699,8 @@ void SimonState::timer_proc1() _copy_partial_mode = 0; } - /* XXX: more stuff here */ if (_video_var_8) { handle_mouse_moved(); - /* XXX: more stuff here */ dx_update_screen_and_palette(); _sync_flag_1 = false; _video_var_8 = false; diff --git a/simon/vga.cpp b/simon/vga.cpp index 3c55ffd3fb..e82c58b4f4 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1388,6 +1388,7 @@ void SimonState::vc_35() void SimonState::vc_36_saveload_thing() { + _video_var_8 = false; uint vga_res = vc_read_next_word(); uint mode = vc_read_next_word(); |