[Scummvm-cvs-logs] SF.net SVN: scummvm: [29825] scummvm/trunk/engines/lure/game.cpp

[dreammaster at users.sourceforge.net]

Revision: 29825
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29825&view=rev
Author:   dreammaster
Date:     2007-12-11 02:12:12 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
Bugfix for the display of ASK, GIVE, and TELL actions in the status line

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-12-11 09:20:24 UTC (rev 29824)
+++ scummvm/trunk/engines/lure/game.cpp	2007-12-11 10:12:12 UTC (rev 29825)
@@ -578,8 +578,17 @@
 		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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.