diff options
| author | eriktorbjorn | 2011-06-18 16:30:29 +0200 |
|---|---|---|
| committer | eriktorbjorn | 2011-06-18 16:30:29 +0200 |
| commit | a7234eef817ae43a93f1e3949a238dd3a3555e10 (patch) | |
| tree | 585d67013302a4f3da8f0c2f800c5cf321975360 /engines/sword25 | |
| parent | cc77de35c23c5cf3caee33b04a93c88fa4e02b29 (diff) | |
| download | scummvm-rg350-a7234eef817ae43a93f1e3949a238dd3a3555e10.tar.gz scummvm-rg350-a7234eef817ae43a93f1e3949a238dd3a3555e10.tar.bz2 scummvm-rg350-a7234eef817ae43a93f1e3949a238dd3a3555e10.zip | |
SWORD25: Fix getting volume settings from config file
The tests had been inverted, so that if there were config file
settings it would use the default settings instead.
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/util/lua/scummvm_file.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp index 3c0377d0ee..9df090f49b 100644 --- a/engines/sword25/util/lua/scummvm_file.cpp +++ b/engines/sword25/util/lua/scummvm_file.cpp @@ -33,10 +33,10 @@ Sword25FileProxy::Sword25FileProxy(const Common::String &filename, const Common: } void Sword25FileProxy::setupConfigFile() { - double sfxVolume = ConfMan.hasKey("sfx_volume") ? 1.0 : 1.0 * ConfMan.getInt("sfx_volume") / 255.0; - double musicVolume = ConfMan.hasKey("music_volume") ? 0.5 : 1.0 * ConfMan.getInt("music_volume") / 255.0; - double speechVolume = ConfMan.hasKey("speech_volume") ? 1.0 : 1.0 * ConfMan.getInt("speech_volume") / 255.0; - bool subtitles = ConfMan.hasKey("subtitles") ? true : ConfMan.getBool("subtitles"); + double sfxVolume = !ConfMan.hasKey("sfx_volume") ? 1.0 : 1.0 * ConfMan.getInt("sfx_volume") / 255.0; + double musicVolume = !ConfMan.hasKey("music_volume") ? 0.5 : 1.0 * ConfMan.getInt("music_volume") / 255.0; + double speechVolume = !ConfMan.hasKey("speech_volume") ? 1.0 : 1.0 * ConfMan.getInt("speech_volume") / 255.0; + bool subtitles = !ConfMan.hasKey("subtitles") ? true : ConfMan.getBool("subtitles"); _readData = Common::String::format( "GAME_LANGUAGE = \"%s\"\r\n\ |