[Scummvm-cvs-logs] scummvm master -> 7b51caedbaa3594736d8a4f28064de1b65816ca4

fingolfin max at quendi.de
Thu May 26 08:27:01 CEST 2011


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

Summary:
2068bc1527 SWORD25: Fix warning: double format, float arg on DC
a2f16d9155 SWORD25: Const correctness
7b51caedba ANDROID: Trying to fix the recent linker failures


Commit: 2068bc1527369ee4468f178b745e9722ef9f695c
    https://github.com/scummvm/scummvm/commit/2068bc1527369ee4468f178b745e9722ef9f695c
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T23:22:36-07:00

Commit Message:
SWORD25: Fix warning: double format, float arg on DC

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 659f5a3..3c0377d 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(


Commit: a2f16d91552aa888ca3d6f8bbbf41aed3ce75874
    https://github.com/scummvm/scummvm/commit/a2f16d91552aa888ca3d6f8bbbf41aed3ce75874
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T23:22:46-07:00

Commit Message:
SWORD25: Const correctness

Changed paths:
    engines/sword25/script/luascript.cpp



diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index 9c65c99..9d39430 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -177,7 +177,7 @@ bool LuaScriptEngine::executeFile(const Common::String &fileName) {
 }
 
 bool LuaScriptEngine::executeString(const Common::String &code) {
-	return executeBuffer((byte *)code.c_str(), code.size(), "???");
+	return executeBuffer((const byte *)code.c_str(), code.size(), "???");
 }
 
 namespace {


Commit: 7b51caedbaa3594736d8a4f28064de1b65816ca4
    https://github.com/scummvm/scummvm/commit/7b51caedbaa3594736d8a4f28064de1b65816ca4
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T23:25:28-07:00

Commit Message:
ANDROID: Trying to fix the recent linker failures

Changed paths:
    configure



diff --git a/configure b/configure
index 7363259..c4536c0 100755
--- a/configure
+++ b/configure
@@ -3105,7 +3105,7 @@ case $_backend in
 		system_libs=''
 		for lib in $LIBS; do
 			case $lib in
-			-lz|-lm)
+			-lz|-lm|-ldl)
 				system_libs="$system_libs $lib"
 				;;
 			*)






More information about the Scummvm-git-logs mailing list