diff options
| author | Travis Howell | 2003-06-05 12:20:05 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-06-05 12:20:05 +0000 |
| commit | 33dceea47702608512f9fb993187d64d43c9a74e (patch) | |
| tree | e8ada89d7bdb519bf28319b45a8fe8a78ffb3147 /simon/items.cpp | |
| parent | 740e7cc0ff523ec4d238f6872f8c96e3cb9a1bc5 (diff) | |
| download | scummvm-rg350-33dceea47702608512f9fb993187d64d43c9a74e.tar.gz scummvm-rg350-33dceea47702608512f9fb993187d64d43c9a74e.tar.bz2 scummvm-rg350-33dceea47702608512f9fb993187d64d43c9a74e.zip | |
Commit combined speech and subtitles patch
Add support for nosubtitles config option
svn-id: r8324
Diffstat (limited to 'simon/items.cpp')
| -rw-r--r-- | simon/items.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 651798b406..f421824b89 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -995,11 +995,10 @@ int SimonEngine::runScript() { if (_game & GF_TALKIE) d = _array_4[a]; - if (d != 0 && !_subtitles) { + if (d != 0) talk_with_speech(d, b); - } else if (s != NULL) { + if (s != NULL && (d == 0 || _subtitles)) talk_with_text(b, c, s, tv->a, tv->b, tv->c); - } } break; @@ -1234,12 +1233,10 @@ void SimonEngine::o_inventory_descriptions() { if (_game == GAME_SIMON1CD32 || _game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) { if (child != NULL && child->avail_props & 0x200) { uint offs = getOffsetOfChild2Param(child, 0x200); - if (!_subtitles) - talk_with_speech(child->array[offs], a); + talk_with_speech(child->array[offs], a); } else if (child != NULL && child->avail_props & 0x100) { uint offs = getOffsetOfChild2Param(child, 0x100); - if (!_subtitles) - talk_with_speech(child->array[offs] + 3550, a); + talk_with_speech(child->array[offs] + 3550, a); } } else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) { if (child != NULL && child->avail_props & 0x200) { @@ -1289,8 +1286,7 @@ void SimonEngine::o_inventory_descriptions() { } } - if (!_subtitles) - talk_with_speech(var200, a); + talk_with_speech(var200, a); } } |