diff options
| author | Travis Howell | 2004-08-16 04:19:43 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-16 04:19:43 +0000 |
| commit | 7cce3cec832317f8eb03ef10b8a81c3cbeaec458 (patch) | |
| tree | c41eb94ad5beb57d620455bbe55cb71459f1077e /simon/simon.cpp | |
| parent | 60a7d6062727c80ddf814e85af436beffc634472 (diff) | |
| download | scummvm-rg350-7cce3cec832317f8eb03ef10b8a81c3cbeaec458.tar.gz scummvm-rg350-7cce3cec832317f8eb03ef10b8a81c3cbeaec458.tar.bz2 scummvm-rg350-7cce3cec832317f8eb03ef10b8a81c3cbeaec458.zip | |
Set _language before checking its value
svn-id: r14632
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 480757f77d..07c35483f9 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -371,6 +371,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) SOUND_INDEX_BASE = 0; } + _language = Common::parseLanguage(ConfMan.get("language")); if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) { gss = PTR(simon2win_settings); @@ -483,7 +484,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _dx_use_3_or_4_for_lock = 0; _debugMode = 0; - _language = 0; _pause = 0; _start_mainscript = 0; _continous_mainscript = 0; @@ -691,7 +691,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) midi.set_volume(ConfMan.getInt("music_volume")); _debugMode = ConfMan.hasKey("debuglevel"); - _language = Common::parseLanguage(ConfMan.get("language")); if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1) midi.pause(_music_paused ^= 1); |