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

[dreammaster at users.sourceforge.net]

Revision: 29891
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29891&view=rev
Author:   dreammaster
Date:     2007-12-16 14:41:51 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Bugfix for Use actions to work correctly

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

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-12-16 21:46:34 UTC (rev 29890)
+++ scummvm/trunk/engines/lure/game.cpp	2007-12-16 22:41:51 UTC (rev 29891)
@@ -583,7 +583,7 @@
 		} else {
 			if (action != TELL) {
 				// Add the hotspot name to the status line and then go do the action
-				if ((itemId != 0xffff) && (action != GIVE)) {
+				if ((itemId != 0xffff) && (action != GIVE) && (action != USE)) {
 					HotspotData *itemHotspot = res.getHotspot(itemId);
 					if (itemHotspot != NULL)
 						strings.getString(itemHotspot->nameId, statusLine);
@@ -846,7 +846,10 @@
 		// placeholder entry, and then replace it's details with the TELL command data
 		player->currentActions().addFront(NONE, player->roomNumber(), 0, 0);
 		player->currentActions().top().supportData().setDetails2(TELL, _numTellCommands * 3 + 1, &_tellCommands[0]);
-	} else
+	} else if (action == USE)
+		// Use action parameters are, for some reason, in reverse order from other 2 item actions
+		player->currentActions().addFront(action, player->roomNumber(), usedId, hotspotId);
+	else
 		// All other action types
 		player->currentActions().addFront(action, player->roomNumber(), hotspotId, usedId);
 }


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