From 70d4f5f84e994bd249e9eceda57233f81eb5a434 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Aug 2015 16:05:38 -0400
Subject: SHERLOCK: RT: Workaround for incorrect tooltip for man on train ride

---
 engines/sherlock/tattoo/tattoo_scene.h     | 2 +-
 engines/sherlock/tattoo/widget_tooltip.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index 8d6a2bafa6..678330077c 100644
--- a/engines/sherlock/tattoo/tattoo_scene.h
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -34,7 +34,7 @@ namespace Tattoo {
 extern const int FS_TRANS[8];
 
 enum {
-	STARTING_GAME_SCENE = 1, WEARY_PUNT = 52, STARTING_INTRO_SCENE = 91, OVERHEAD_MAP2 = 90, OVERHEAD_MAP = 100
+	STARTING_GAME_SCENE = 1, WEARY_PUNT = 52, TRAIN_RIDE = 69, STARTING_INTRO_SCENE = 91, OVERHEAD_MAP2 = 90, OVERHEAD_MAP = 100
 };
 
 struct SceneTripEntry {
diff --git a/engines/sherlock/tattoo/widget_tooltip.cpp b/engines/sherlock/tattoo/widget_tooltip.cpp
index 3d2ca1f7f7..b29f45f531 100644
--- a/engines/sherlock/tattoo/widget_tooltip.cpp
+++ b/engines/sherlock/tattoo/widget_tooltip.cpp
@@ -191,6 +191,10 @@ void WidgetSceneTooltip::handleEvents() {
 				// Get the description string
 				str = (ui._bgFound < 1000) ? scene._bgShapes[ui._bgFound]._description :
 					people[ui._bgFound - 1000]._description;
+
+				// WORKAORUND: On the train ride to Cambridge, don't show any tooltips
+				if (scene._currentScene == TRAIN_RIDE)
+					str = "";
 			} else {
 				// Get the exit zone description
 				str = scene._exits[ui._arrowZone]._dest;
-- 
cgit v1.2.3