From f826e62771c43b601258dad6436760835e83dced Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 11 Dec 2007 10:12:12 +0000
Subject: Bugfix for the display of ASK, GIVE, and TELL actions in the status
 line

svn-id: r29825
---
 engines/lure/game.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 041d4cc6dc..5d71ee848e 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -578,8 +578,17 @@ void Game::handleRightClickMenu() {
 		if (hotspot == NULL) {
 			doAction(action, 0, itemId);
 		} else {
-			// Add the hotspot name to the status line and then go do the action
-			strings.getString(hotspot->nameId, statusLine);
+			if (action != TELL) {
+				// Add the hotspot name to the status line and then go do the action
+				if ((itemId != 0xffff) && (action != GIVE)) {
+					HotspotData *itemHotspot = res.getHotspot(itemId);
+					if (itemHotspot != NULL)
+						strings.getString(itemHotspot->nameId, statusLine);
+				}
+				else
+					strings.getString(hotspot->nameId, statusLine);
+			}
+
 			doAction(action, hotspot->hotspotId, itemId);
 		}
 	} else {
-- 
cgit v1.2.3