[Scummvm-cvs-logs] scummvm master -> 5299750cf9dce3dec59b7bd95bbac2a25ce62bfd

[m-kiewitz]

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:
5299750cf9 SHERLOCK: SS: fix warnings


Commit: 5299750cf9dce3dec59b7bd95bbac2a25ce62bfd
    https://github.com/scummvm/scummvm/commit/5299750cf9dce3dec59b7bd95bbac2a25ce62bfd
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-31T18:42:14+01:00

Commit Message:
SHERLOCK: SS: fix warnings

thanks to eriktorbjorn for pointing those out

Changed paths:
    engines/sherlock/scalpel/scalpel_inventory.cpp
    engines/sherlock/scalpel/scalpel_user_interface.cpp
    engines/sherlock/scalpel/scalpel_user_interface.h



diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp
index 19e0b95..c3e2029 100644
--- a/engines/sherlock/scalpel/scalpel_inventory.cpp
+++ b/engines/sherlock/scalpel/scalpel_inventory.cpp
@@ -154,16 +154,16 @@ void ScalpelInventory::invCommands(bool slamIt) {
 			true, _fixedTextGive);
 		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"^^", false); // 2 arrows pointing to the left
+			"^^"); // 2 arrows pointing to the left
 		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"^", false); // 2 arrows pointing to the left
+			"^"); // 2 arrows pointing to the left
 		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"_", false); // 1 arrow pointing to the right
+			"_"); // 1 arrow pointing to the right
 		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"__", false); // 2 arrows pointing to the right
+			"__"); // 2 arrows pointing to the right
 		if (_invMode != INVMODE_LOOK)
 			ui.clearInfo();
 	} else {
@@ -181,16 +181,16 @@ void ScalpelInventory::invCommands(bool slamIt) {
 			false, _fixedTextGive);
 		screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"^^", false); // 2 arrows pointing to the left
+			"^^"); // 2 arrows pointing to the left
 		screen.gPrint(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"^", false); // 1 arrow pointing to the left
+			"^"); // 1 arrow pointing to the left
 		screen.gPrint(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"_", false); // 1 arrow pointing to the right
+			"_"); // 1 arrow pointing to the right
 		screen.gPrint(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
-			"__", false); // 2 arrows pointing to the right
+			"__"); // 2 arrows pointing to the right
 	}
 }
 
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 221555a..3c2ed42 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -469,7 +469,7 @@ void ScalpelUserInterface::pushButton(int num) {
 	restoreButton(num);
 }
 
-void ScalpelUserInterface::toggleButton(int num) {
+void ScalpelUserInterface::toggleButton(uint16 num) {
 	Screen &screen = *_vm->_screen;
 
 	if (_menuMode != (MenuMode)(num + 1)) {
@@ -1312,7 +1312,7 @@ void ScalpelUserInterface::doMainControl() {
 		_temp = 12; // no button currently selected
 
 		// Check whether the mouse is in any of the command areas
-		for (int buttonNr = 0; buttonNr < 12; buttonNr++) {
+		for (uint16 buttonNr = 0; buttonNr < 12; buttonNr++) {
 			Common::Rect r(MENU_POINTS[buttonNr][0], MENU_POINTS[buttonNr][1],
 				MENU_POINTS[buttonNr][2], MENU_POINTS[buttonNr][3]);
 			if (IS_3DO && buttonNr >= 0 && buttonNr <= 2) {
@@ -1351,7 +1351,7 @@ void ScalpelUserInterface::doMainControl() {
 
 		byte key = toupper(_keyPress);
 
-		for (int16 buttonId = 0; buttonId < sizeof(_hotkeysIndexed); buttonId++) {
+		for (uint16 buttonId = 0; buttonId < sizeof(_hotkeysIndexed); buttonId++) {
 			if (key == _hotkeysIndexed[buttonId]) {
 				pressedButtonId = buttonId;
 			}
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index 9d021bd..c0b8672 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -89,7 +89,7 @@ private:
 	 * have already been drawn. This simply takes care of switching the mode around
 	 * accordingly
 	 */
-	void toggleButton(int num);
+	void toggleButton(uint16 num);
 
 	/**
 	 * Print the name of an object in the scene