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

[dreammaster]

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:
ac24e8799f SHERLOCK: SS: Fix gcc compiler warnings


Commit: ac24e8799f72a7c1e8494c7a97a0ab9faa5d01fd
    https://github.com/scummvm/scummvm/commit/ac24e8799f72a7c1e8494c7a97a0ab9faa5d01fd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-11T15:24:48-04:00

Commit Message:
SHERLOCK: SS: Fix gcc compiler warnings

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp
    engines/sherlock/scalpel/scalpel_user_interface.cpp



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 375b27b..2c447b0 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -715,7 +715,8 @@ void ScalpelTalk::drawInterface() {
 
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
 			160 - fixedText_PressKeyToContinueLen / 2, fixedText_PressKeyToContinue);
-		screen.gPrint(Common::Point(160 - fixedText_PressKeyToContinueLen / 2, CONTROLS_Y), COMMAND_FOREGROUND, fixedText_PressKeyToContinueHotkey.c_str());
+		screen.gPrint(Common::Point(160 - fixedText_PressKeyToContinueLen / 2, CONTROLS_Y), COMMAND_FOREGROUND, 
+			"%s", fixedText_PressKeyToContinueHotkey.c_str());
 	}
 }
 
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 8baf4fe..79d74ba 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1946,9 +1946,8 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
 			(SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyForMoreLen) / 2,
 			fixedText_PressKeyForMore);
-		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
-			fixedText_PressKeyForMoreLen) / 2, CONTROLS_Y),
-			COMMAND_FOREGROUND, fixedText_PressKeyForMoreHotkey.c_str());
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyForMoreLen) / 2, CONTROLS_Y),
+			COMMAND_FOREGROUND, "%s", fixedText_PressKeyForMoreHotkey.c_str());
 		_descStr = msgP;
 	} else {
 		Common::String fixedText_PressKeyToContinue = fixedText.getText(kFixedText_PressKey_ToContinue);
@@ -1958,9 +1957,8 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
 			(SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyToContinueLen) / 2,
 			fixedText_PressKeyToContinue);
-		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
-			fixedText_PressKeyToContinueLen) / 2, CONTROLS_Y),
-			COMMAND_FOREGROUND, fixedText_PressKeyToContinueHotkey.c_str());
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyToContinueLen) / 2, CONTROLS_Y),
+			COMMAND_FOREGROUND, "%s", fixedText_PressKeyToContinueHotkey.c_str());
 		_descStr = "";
 	}