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

[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:
a28d34b7b9 SHERLOCK: RT: Fix showing tooltips for solid objects in lab scene


Commit: a28d34b7b988834dfb45e2e3a8027f2dd69983df
    https://github.com/scummvm/scummvm/commit/a28d34b7b988834dfb45e2e3a8027f2dd69983df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-20T21:58:05-04:00

Commit Message:
SHERLOCK: RT: Fix showing tooltips for solid objects in lab scene

Changed paths:
    engines/sherlock/tattoo/tattoo_scene.cpp
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index a171da1..ba462ca 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -725,6 +725,17 @@ int TattooScene::findBgShape(const Common::Point &pt) {
 
 	int result = Scene::findBgShape(pt);
 	if (result == -1) {
+		if (_labTableScene) {
+			// Check for SOLID objects in the lab scene
+			for (int idx = (int)_bgShapes.size() - 1; idx >= 0; --idx) {
+				Object &o = _bgShapes[idx];
+				if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN && o._aType == SOLID) {
+					if (o.getNewBounds().contains(pt))
+						return idx;
+				}
+			}
+		}
+
 		// No shape found, so check whether a character is highlighted
 		for (int idx = 1; idx < MAX_CHARACTERS && result == -1; ++idx) {
 			Person &person = people[idx];
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index e846db2..04be008 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -308,7 +308,7 @@ void TattooUserInterface::drawInterface(int bufferNum) {
 		screen.blockMove();
 
 	// Handle drawing the text tooltip if necessary
-	if (_menuMode == STD_MODE)
+	if (_menuMode == STD_MODE || _menuMode == LAB_MODE)
 		_tooltipWidget.draw();
 }