diff options
| author | Travis Howell | 2003-12-02 08:09:14 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-02 08:09:14 +0000 |
| commit | c793e4c9df8a241869f94cc50deca24685597298 (patch) | |
| tree | ed345e5b368d5a74806085d500c67d502f9161f1 /simon | |
| parent | af02beefd950eeb931fab78b91fe9c518d55c476 (diff) | |
| download | scummvm-rg350-c793e4c9df8a241869f94cc50deca24685597298.tar.gz scummvm-rg350-c793e4c9df8a241869f94cc50deca24685597298.tar.bz2 scummvm-rg350-c793e4c9df8a241869f94cc50deca24685597298.zip | |
Switch nosubtitles option to subtitles, to match others and help with Simon2 issue.
svn-id: r11458
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index b8a8b02f48..e69661dff5 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -498,7 +498,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _language = Common::parseLanguage(ConfMan.get("language")); - _noSubtitles = ConfMan.getBool("nosubtitles"); + _subtitles = ConfMan.getBool("subtitles"); _system->init_size(320, 200); @@ -4702,13 +4702,11 @@ void SimonEngine::go() { if (_game & GF_TALKIE) { _speech = true; - if ((_game & GF_SIMON2) || _language >= 2) { - if (_noSubtitles) - _subtitles = false; // English and German versions of Simon the Sorcerer 1 don't have full subtitles - } else { + if (!(_game & GF_SIMON2) || _language < 2) _subtitles = false; - } + } else { + _subtitles = true; } if (_language == 4 || (_language > 5 && _language < 20)) |