aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25
diff options
context:
space:
mode:
authorMax Horn2011-05-26 08:22:36 +0200
committerMax Horn2011-05-26 08:22:36 +0200
commit2068bc1527369ee4468f178b745e9722ef9f695c (patch)
treec2a78b938dedfdd75f1bc2d1516f0120778a293d /engines/sword25
parent2c8a9b0e7669df1914b8e01d347fef7e8776ef11 (diff)
downloadscummvm-rg350-2068bc1527369ee4468f178b745e9722ef9f695c.tar.gz
scummvm-rg350-2068bc1527369ee4468f178b745e9722ef9f695c.tar.bz2
scummvm-rg350-2068bc1527369ee4468f178b745e9722ef9f695c.zip
SWORD25: Fix warning: double format, float arg on DC
Diffstat (limited to 'engines/sword25')
-rw-r--r--engines/sword25/util/lua/scummvm_file.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp
index 659f5a36c2..3c0377d0ee 100644
--- a/engines/sword25/util/lua/scummvm_file.cpp
+++ b/engines/sword25/util/lua/scummvm_file.cpp
@@ -33,9 +33,9 @@ Sword25FileProxy::Sword25FileProxy(const Common::String &filename, const Common:
}
void Sword25FileProxy::setupConfigFile() {
- float sfxVolume = ConfMan.hasKey("sfx_volume") ? 1.0 : 1.0 * ConfMan.getInt("sfx_volume") / 255.0;
- float musicVolume = ConfMan.hasKey("music_volume") ? 0.5 : 1.0 * ConfMan.getInt("music_volume") / 255.0;
- float speechVolume = ConfMan.hasKey("speech_volume") ? 1.0 : 1.0 * ConfMan.getInt("speech_volume") / 255.0;
+ 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(