[Scummvm-cvs-logs] scummvm master -> a7234eef817ae43a93f1e3949a238dd3a3555e10

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a7234eef81 SWORD25: Fix getting volume settings from config file


Commit: a7234eef817ae43a93f1e3949a238dd3a3555e10
    https://github.com/scummvm/scummvm/commit/a7234eef817ae43a93f1e3949a238dd3a3555e10
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-06-18T07:30:29-07:00

Commit Message:
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.

Changed paths:
    engines/sword25/util/lua/scummvm_file.cpp



diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp
index 3c0377d..9df090f 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\