[Scummvm-cvs-logs] scummvm master -> 9a4086b08e0621d16a9421d087a7828d47e79b13

dreammaster dreammaster at scummvm.org
Sat Jul 11 04:26:20 CEST 2015


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:
9a4086b08e SHERLOCK: RT: Fix compiler warnings


Commit: 9a4086b08e0621d16a9421d087a7828d47e79b13
    https://github.com/scummvm/scummvm/commit/9a4086b08e0621d16a9421d087a7828d47e79b13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-10T22:25:19-04:00

Commit Message:
SHERLOCK: RT: Fix compiler warnings

Changed paths:
    engines/sherlock/scene.cpp
    engines/sherlock/tattoo/tattoo_darts.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e56561f..a335740 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1117,7 +1117,7 @@ void Scene::checkSceneFlags(bool flag) {
 						// Flag it as needing to be hidden after first erasing it
 						o._type = mode;
 				}
-			} else if (IS_ROSE_TATTOO || o._requiredFlag > 0) {
+			} else if (IS_ROSE_TATTOO || o._requiredFlag[0] > 0) {
 				// Restore object
 				if (o._images == nullptr || o._images->size() == 0)
 					o._type = NO_SHAPE;
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp
index 77f6b59..e9bbf2b 100644
--- a/engines/sherlock/tattoo/tattoo_darts.cpp
+++ b/engines/sherlock/tattoo/tattoo_darts.cpp
@@ -30,7 +30,7 @@ namespace Tattoo {
 
 enum {
 	DART_COLOR_FORE	= 5,
-	PLAYER_COLOR	= 11,
+	PLAYER_COLOR	= 11
 };
 
 const int STATUS_INFO_X = 430;
@@ -185,17 +185,13 @@ void Darts::showNames(int playerNum) {
 
 void Darts::showStatus(int playerNum) {
 	Screen &screen = *_vm->_screen;
-	byte color;
 	const char *const CRICKET_SCORE_NAME[7] = { "20", "19", "18", "17", "16", "15", FIXED(Bull) };
 
 	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 10),
 		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, STATUS_INFO_X + STATUS_INFO_WIDTH,
 		STATUS_INFO_Y + STATUS_INFO_HEIGHT - 10));
-
-	color = (playerNum == 0) ? PLAYER_COLOR : DART_COLOR_FORE;
 	screen.print(Common::Point(STATUS_INFO_X + 30, STATUS_INFO_Y + _spacing + 4), 0, "%d", _score1);
 
-	color = (playerNum == 1) ? PLAYER_COLOR : DART_COLOR_FORE;
 	screen.print(Common::Point(STATUS2_INFO_X + 30, STATUS_INFO_Y + _spacing + 4), 0, "%d", _score2);
 
 	int temp = (_gameType == GAME_CRICKET) ? STATUS_INFO_Y + 10 * _spacing + 5 : STATUS_INFO_Y + 55;
@@ -209,8 +205,6 @@ void Darts::showStatus(int playerNum) {
 			screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 40 + x * _spacing), 0, "%s:", CRICKET_SCORE_NAME[x]);
 
 			for (int y = 0; y < 2; ++y) {
-				color = (playerNum == y) ? PLAYER_COLOR : DART_COLOR_FORE;
-				
 				switch (CRICKET_SCORE_NAME[y][x]) {
 				case 1:
 					screen.print(Common::Point(STATUS_INFO_X + 38 + y*STATUS2_X_ADD, STATUS_INFO_Y + 40 + x * _spacing), 0, "/");






More information about the Scummvm-git-logs mailing list