[Scummvm-cvs-logs] scummvm master -> 276a96f1274b3606f666e0c3ac9fb62d5659d24a

[eriktorbjorn]

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

Summary:
26072306de SHERLOCK: Use BLACK instead of 0 for consistency
276a96f127 SHERLOCK: Added color enum for 235 (button background color?)


Commit: 26072306de2a22e7b090ff49f7b720807b76bcbc
    https://github.com/scummvm/scummvm/commit/26072306de2a22e7b090ff49f7b720807b76bcbc
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-13T12:20:17+02:00

Commit Message:
SHERLOCK: Use BLACK instead of 0 for consistency

I've deliberately left the 0 in showCityCutscene3DO(), because in
that one case it clearly isn't a palette index. (Though in the case
of black, it makes no difference.)

Changed paths:
    engines/sherlock/scalpel/darts.cpp
    engines/sherlock/scalpel/scalpel_map.cpp



diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 04e4de8..a24af4e 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -366,8 +366,8 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 void Darts::erasePowerBars() {
 	Screen &screen = *_vm->_screen;
 
-	screen._backBuffer1.fillRect(Common::Rect(DARTBARHX, DARTHORIZY, DARTBARHX + DARTBARSIZE, DARTHORIZY + 10), 0);
-	screen._backBuffer1.fillRect(Common::Rect(DARTBARVX, DARTHEIGHTY, DARTBARVX + 10, DARTHEIGHTY + DARTBARSIZE), 0);
+	screen._backBuffer1.fillRect(Common::Rect(DARTBARHX, DARTHORIZY, DARTBARHX + DARTBARSIZE, DARTHORIZY + 10), BLACK);
+	screen._backBuffer1.fillRect(Common::Rect(DARTBARVX, DARTHEIGHTY, DARTBARVX + 10, DARTHEIGHTY + DARTBARSIZE), BLACK);
 	screen._backBuffer1.transBlitFrom((*_dartImages)[2], Common::Point(DARTBARHX - 1, DARTHORIZY - 1));
 	screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1));
 	screen.slamArea(DARTBARHX - 1, DARTHORIZY - 1, DARTBARSIZE + 3, 11);
diff --git a/engines/sherlock/scalpel/scalpel_map.cpp b/engines/sherlock/scalpel/scalpel_map.cpp
index 63cb4a3..38a337d 100644
--- a/engines/sherlock/scalpel/scalpel_map.cpp
+++ b/engines/sherlock/scalpel/scalpel_map.cpp
@@ -362,8 +362,8 @@ void ScalpelMap::showPlaceName(int idx, bool highlighted) {
 
 	if (highlighted) {
 		int xp = (SHERLOCK_SCREEN_WIDTH - screen.stringWidth(name)) / 2;
-		screen.gPrint(Common::Point(xp + 2, 2), 0, "%s", name.c_str());
-		screen.gPrint(Common::Point(xp + 1, 1), 0, "%s", name.c_str());
+		screen.gPrint(Common::Point(xp + 2, 2), BLACK, "%s", name.c_str());
+		screen.gPrint(Common::Point(xp + 1, 1), BLACK, "%s", name.c_str());
 		screen.gPrint(Common::Point(xp, 0), 12, "%s", name.c_str());
 
 		screen.slamArea(xp, 0, width + 2, 15);


Commit: 276a96f1274b3606f666e0c3ac9fb62d5659d24a
    https://github.com/scummvm/scummvm/commit/276a96f1274b3606f666e0c3ac9fb62d5659d24a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-13T12:27:17+02:00

Commit Message:
SHERLOCK: Added color enum for 235 (button background color?)

At some point, at least some of these will have to be handled
differentl for the 3DO version, since it uses 16 bpp. I hope this
will make them easier to find when that time comes.

Changed paths:
    engines/sherlock/inventory.cpp
    engines/sherlock/scalpel/scalpel_user_interface.cpp
    engines/sherlock/screen.h



diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 7fedab8..929be0e 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -152,7 +152,7 @@ void Inventory::putInv(InvSlamMode slamIt) {
 
 		// Draw the background
 		if (idx == ui._selector) {
-			bb.fillRect(r, 235);
+			bb.fillRect(r, BUTTON_BACKGROUND);
 		} else if (slamIt == SLAM_SECONDARY_BUFFER) {
 			bb.fillRect(r, BUTTON_MIDDLE);
 		}
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 8dd15e5..ef92218 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1079,7 +1079,7 @@ void ScalpelUserInterface::doInvControl() {
 		}
 
 		if (_selector != -1)
-			inv.highlight(_selector, 235);
+			inv.highlight(_selector, BUTTON_BACKGROUND);
 
 		_oldSelector = _selector;
 	}
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 02c09be..aa67e60 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -51,6 +51,7 @@ enum {
 	BUTTON_TOP			= 233,
 	BUTTON_MIDDLE		= 244,
 	BUTTON_BOTTOM		= 248,
+	BUTTON_BACKGROUND	= 235,
 	TALK_FOREGROUND		= 12,
 	TALK_NULL			= 16,
 	PEN_COLOR			= 250