diff options
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 6 | ||||
| -rw-r--r-- | simon/simon.h | 1 | ||||
| -rw-r--r-- | simon/vga.cpp | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 8bdbc175bc..ed9dfb643e 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3098,7 +3098,7 @@ void SimonState::processSpecialKeys() { break; case 't': - if (_game & GF_SIMON2) + if (_game & GF_SIMON2 && _game & GF_TALKIE) _subtitles ^= 1; break; @@ -3482,10 +3482,6 @@ void SimonState::video_toggle_colors(HitArea * ha, byte a, byte b, byte c, byte _lock_word &= ~0x8000; } -bool SimonState::vc_59_helper() { - return _sound->_voice_handle == 0; -} - void SimonState::video_copy_if_flag_0x8_c(FillOrCopyStruct *fcs) { if (fcs->flags & 8) copy_img_from_3_to_2(fcs); diff --git a/simon/simon.h b/simon/simon.h index d77feca331..f61ad9d561 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -689,7 +689,6 @@ public: VgaSprite *find_cur_sprite(); void vc_set_bit_to(uint bit, bool value); - bool vc_59_helper(); void expire_vga_timers(); bool has_vgastruct_with_id(uint16 id, uint16 file); diff --git a/simon/vga.cpp b/simon/vga.cpp index 321e4d4dff..42912cd5d3 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1582,7 +1582,7 @@ void SimonState::vc_59() { vc_kill_thread(file, start); } while (++start != end); } else { - if (vc_59_helper()) + if (_sound->_voice_handle == 0) vc_skip_next_instruction(); } } @@ -1760,7 +1760,7 @@ void SimonState::vc_63_palette_thing_2() { void SimonState::vc_64_skip_if_text() { // Simon2 - if (vc_59_helper()) + if (_sound->_voice_handle == 0) vc_skip_next_instruction(); } |