diff options
| author | Travis Howell | 2003-12-22 11:08:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-22 11:08:35 +0000 |
| commit | d668694d667413df77f51955e18dd96245486f7e (patch) | |
| tree | f8c67f87178f4628db7cf7dce43ce38c37d463d7 /simon | |
| parent | 1e5496b2c8fc998e9210d90e05ff006e0409918a (diff) | |
| download | scummvm-rg350-d668694d667413df77f51955e18dd96245486f7e.tar.gz scummvm-rg350-d668694d667413df77f51955e18dd96245486f7e.tar.bz2 scummvm-rg350-d668694d667413df77f51955e18dd96245486f7e.zip | |
Switch back to older method (Used in Hebrew version) of combined speech and subtitles for Simon2.
svn-id: r11847
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 16 | ||||
| -rw-r--r-- | simon/vga.cpp | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 56539bccb2..ab503d808e 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -565,15 +565,19 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) if (!(_game & GF_SIMON2) && _language > 1) { if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0) _subtitles = 0; - } else if (_speech) + } else _subtitles = ConfMan.getBool("subtitles"); + // Make sure either speech or subtitles is enabled + if ((_game & GF_TALKIE) && !_speech && !_subtitles) + _subtitles = 1; + if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0) _fade = 0; + if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1) _speed = ConfMan.getInt("slow_down"); - _system->init_size(320, 200); // FIXME Use auto dirty rects cleanup code to reduce CPU usage @@ -4070,10 +4074,12 @@ void SimonEngine::talk_with_speech(uint speech_id, uint vga_sprite_id) { } _skip_vga_wait = true; } else { - if (_subtitles) { - _sound->playVoice(speech_id); - return; + if (_subtitles && _scriptvar_2) { + start_vga_code(4, 2, 5, 0, 0, 0); + o_wait_for_vga(205); + o_kill_sprite_simon2(2,5); } + o_kill_sprite_simon2(2, vga_sprite_id + 2); _sound->playVoice(speech_id); start_vga_code(4, 2, vga_sprite_id + 2, 0, 0, 0); diff --git a/simon/vga.cpp b/simon/vga.cpp index 529712f45e..d7f46ef896 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1785,7 +1785,7 @@ void SimonEngine::vc_63_palette_thing_2() { void SimonEngine::vc_64_skip_if_no_speech() { // Simon2 - if ((_sound->_voice_handle == 0) || _subtitles) + if (_sound->_voice_handle == 0) vc_skip_next_instruction(); } |