diff options
| author | Travis Howell | 2003-12-18 11:16:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-18 11:16:10 +0000 |
| commit | ffc068734d5df485ef63d6f81cab467921d2bd26 (patch) | |
| tree | e385ddf2f6e65c31bef3ca755a1a7c0c3a20f50f /simon | |
| parent | c10eace9e383169468778c0d0d8c892d3b249add (diff) | |
| download | scummvm-rg350-ffc068734d5df485ef63d6f81cab467921d2bd26.tar.gz scummvm-rg350-ffc068734d5df485ef63d6f81cab467921d2bd26.tar.bz2 scummvm-rg350-ffc068734d5df485ef63d6f81cab467921d2bd26.zip | |
Safetly check
svn-id: r11739
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index fe86fa8d68..00879c87ef 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -543,10 +543,13 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _debugLevel = ConfMan.getInt("debuglevel"); _language = Common::parseLanguage(ConfMan.get("language")); + if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0) + _speech = 0; + if (!(_game & GF_SIMON2) && _language > 1) { if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0) _subtitles = 0; - } else + } else if (_speech) _subtitles = ConfMan.getBool("subtitles"); if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0) @@ -554,8 +557,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1) _speed = ConfMan.getInt("slow_down"); - if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0) - _speech = 0; _system->init_size(320, 200); |