diff options
| author | Paul Gilbert | 2015-07-10 22:25:19 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-10 22:25:19 -0400 |
| commit | 9a4086b08e0621d16a9421d087a7828d47e79b13 (patch) | |
| tree | 22fcb473ffd0e4fd5603dddb15223cd3280fcc85 | |
| parent | 0c14679e46b71f5189ca3120ab1c6df6885f8c7b (diff) | |
| download | scummvm-rg350-9a4086b08e0621d16a9421d087a7828d47e79b13.tar.gz scummvm-rg350-9a4086b08e0621d16a9421d087a7828d47e79b13.tar.bz2 scummvm-rg350-9a4086b08e0621d16a9421d087a7828d47e79b13.zip | |
SHERLOCK: RT: Fix compiler warnings
| -rw-r--r-- | engines/sherlock/scene.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_darts.cpp | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index e56561fb5f..a33574030f 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 77f6b59211..e9bbf2b6b0 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, "/"); |