diff options
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 2ed3a513f5..c7cfa41734 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -366,28 +366,33 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) } _language = Common::parseLanguage(ConfMan.get("language")); - if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) { - gss = PTR(simon2win_settings); - - // Add default file directories - File::addDefaultDirectory(_gameDataPath + "voices/"); - File::addDefaultDirectory(_gameDataPath + "VOICES/"); - } else if (_game & GF_SIMON2) - gss = PTR(simon2dos_settings); - else if (_game & GF_ACORN) { - gss = PTR(simon1acorn_settings); + if (_game & GF_SIMON2) { + if (_game & GF_TALKIE) { + gss = PTR(simon2win_settings); - // Add default file directories - File::addDefaultDirectory(_gameDataPath + "execute/"); - File::addDefaultDirectory(_gameDataPath + "EXECUTE/"); - } else if (_game & GF_AMIGA) { - gss = PTR(simon1amiga_settings); - } else if (_game & GF_DEMO) - gss = PTR(simon1demo_settings); - else - gss = PTR(simon1_settings); + // Add default file directories + File::addDefaultDirectory(_gameDataPath + "voices/"); + File::addDefaultDirectory(_gameDataPath + "VOICES/"); + } else { + gss = PTR(simon2dos_settings); + } + } else if (_game & GF_SIMON1) { + if (_game & GF_ACORN) { + gss = PTR(simon1acorn_settings); + + // Add default file directories + File::addDefaultDirectory(_gameDataPath + "execute/"); + File::addDefaultDirectory(_gameDataPath + "EXECUTE/"); + } else if (_game & GF_AMIGA) { + gss = PTR(simon1amiga_settings); + } else if (_game & GF_DEMO) { + gss = PTR(simon1demo_settings); + } else { + gss = PTR(simon1_settings); + } + } - if (!(_game & GF_SIMON2) && (_game & GF_TALKIE)) { + if ((_game & GF_SIMON1) && (_game & GF_TALKIE)) { // Add default file directories switch (_language) { case 20: |