aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2007-12-11 10:12:12 +0000
committerPaul Gilbert2007-12-11 10:12:12 +0000
commitf826e62771c43b601258dad6436760835e83dced (patch)
tree772d8490bb77a138b527be7f301dccf9f72d9afa /engines
parent4a8cca094c0576cf67c32dc0832b25aa26914495 (diff)
downloadscummvm-rg350-f826e62771c43b601258dad6436760835e83dced.tar.gz
scummvm-rg350-f826e62771c43b601258dad6436760835e83dced.tar.bz2
scummvm-rg350-f826e62771c43b601258dad6436760835e83dced.zip
Bugfix for the display of ASK, GIVE, and TELL actions in the status line
svn-id: r29825
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/game.cpp13
1 files changed, 11 insertions, 2 deletions
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 {