diff options
| author | Travis Howell | 2003-06-05 13:21:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-06-05 13:21:03 +0000 |
| commit | ceb1a34b057ddfad91bd71daafceb4af6d4c509e (patch) | |
| tree | 44e965549e03c6f27b0f608d31d4855304216c43 | |
| parent | 33dceea47702608512f9fb993187d64d43c9a74e (diff) | |
| download | scummvm-rg350-ceb1a34b057ddfad91bd71daafceb4af6d4c509e.tar.gz scummvm-rg350-ceb1a34b057ddfad91bd71daafceb4af6d4c509e.tar.bz2 scummvm-rg350-ceb1a34b057ddfad91bd71daafceb4af6d4c509e.zip | |
Last commit should have been made simon1 only
svn-id: r8325
| -rw-r--r-- | simon/items.cpp | 18 | ||||
| -rw-r--r-- | simon/simon.cpp | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index f421824b89..fdd6a82c4d 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -995,10 +995,17 @@ int SimonEngine::runScript() { if (_game & GF_TALKIE) d = _array_4[a]; - if (d != 0) - talk_with_speech(d, b); - if (s != NULL && (d == 0 || _subtitles)) - talk_with_text(b, c, s, tv->a, tv->b, tv->c); + if (_game & GF_SIMON2) { + if (d != 0 && !_subtitles) + talk_with_speech(d, b); + else if (s != NULL) + talk_with_text(b, c, s, tv->a, tv->b, tv->c); + } else { + if (d != 0) + talk_with_speech(d, b); + if (s != NULL && _subtitles) + talk_with_text(b, c, s, tv->a, tv->b, tv->c); + } } break; @@ -1286,7 +1293,8 @@ void SimonEngine::o_inventory_descriptions() { } } - talk_with_speech(var200, a); + if (!_subtitles) + talk_with_speech(var200, a); } } diff --git a/simon/simon.cpp b/simon/simon.cpp index 379a2ee4bc..f1cd46a605 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2054,7 +2054,7 @@ void SimonEngine::o_print_str() { case GAME_SIMON2TALKIE: case GAME_SIMON2WIN: case GAME_SIMON2MAC: - if (speech_id != 0 && num_1 == 1) + if (speech_id != 0 && num_1 == 1 && !_subtitles) talk_with_speech(speech_id, num_1); if (speech_id != 0 && !_subtitles) |