[Scummvm-cvs-logs] scummvm master -> 70d4f5f84e994bd249e9eceda57233f81eb5a434
dreammaster
dreammaster at scummvm.org
Sun Aug 23 22:06:22 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:
70d4f5f84e SHERLOCK: RT: Workaround for incorrect tooltip for man on train ride
Commit: 70d4f5f84e994bd249e9eceda57233f81eb5a434
https://github.com/scummvm/scummvm/commit/70d4f5f84e994bd249e9eceda57233f81eb5a434
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-23T16:05:38-04:00
Commit Message:
SHERLOCK: RT: Workaround for incorrect tooltip for man on train ride
Changed paths:
engines/sherlock/tattoo/tattoo_scene.h
engines/sherlock/tattoo/widget_tooltip.cpp
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index 8d6a2ba..6783300 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 3d2ca1f..b29f45f 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;
More information about the Scummvm-git-logs
mailing list