diff options
| author | Travis Howell | 2003-10-26 05:31:36 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-26 05:31:36 +0000 |
| commit | c7e723ceb4842b5e164e9475a28ecee72b93392a (patch) | |
| tree | d3925e84cf55121425f455c52715248d63da1036 /simon/items.cpp | |
| parent | 1b38419b424cc7e16048dfc3860e0915fa568bd5 (diff) | |
| download | scummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.tar.gz scummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.tar.bz2 scummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.zip | |
Add combined speech and subtitles support for simon2.
svn-id: r10972
Diffstat (limited to 'simon/items.cpp')
| -rw-r--r-- | simon/items.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 34951fb70b..4b922dcf57 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1001,17 +1001,10 @@ int SimonEngine::runScript() { if (_game & GF_TALKIE) speech_id = _array_4[string_id]; - if (_game & GF_SIMON2) { - if (speech_id != 0 && (_language == 20 || !_subtitles)) - talk_with_speech(speech_id, vga_struct_id); - if (string_ptr != NULL && _subtitles) - talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c); - } else { - if (speech_id != 0) - talk_with_speech(speech_id, vga_struct_id); - if (string_ptr != NULL && _subtitles) - talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c); - } + if (speech_id != 0) + talk_with_speech(speech_id, vga_struct_id); + if (string_ptr != NULL && _subtitles) + talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c); } break; @@ -1298,7 +1291,7 @@ void SimonEngine::o_inventory_descriptions() { } } - if (_language == 20 || !_subtitles) + if (_subtitles) talk_with_speech(var200, vga_struct_id); } |