SHERLOCK: RT: Fix tooltip display when using inventory item

scummvm · Jul 19, 2015 · 48f5ef8 · 48f5ef8
1 parent 23471ee
commit 48f5ef8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
@@ -89,6 +89,8 @@ void Events::setCursor(CursorId cursorId) {
 
 void Events::setCursor(const Graphics::Surface &src, int hotspotX, int hotspotY) {
 	_cursorId = INVALID_CURSOR;
+	_hotspotPos = Common::Point(hotspotX, hotspotY);
+
 	if (!IS_3DO) {
 		// PC 8-bit palettized
 		CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0xff);

diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
@@ -59,6 +59,7 @@ class Events {
 	bool _oldRightButton;
 	bool _firstPress;
 	Common::Stack<Common::KeyState> _pendingKeys;
+	Common::Point _hotspotPos;
 public:
 	Events(SherlockEngine *vm);
 	~Events();

diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -230,6 +230,10 @@ void WidgetInventoryTooltip::handleEvents() {
 		return;
 	}
 
+	if (_owner->_invVerbMode == 3)
+		// Adjust tooltip to be above the inventory item being shown above the standard cursor
+		mousePos.y -= events._hotspotPos.y;
+
 	// Update the position of the tooltip
 	int xs = CLIP(mousePos.x - _bounds.width() / 2, 0, SHERLOCK_SCENE_WIDTH - _bounds.width());
 	int ys = CLIP(mousePos.y - _bounds.height(), 0, SHERLOCK_SCREEN_HEIGHT - _bounds.height());