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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Jul 30 14:15:57 CEST 2006


Revision: 23632
Author:   dreammaster
Date:     2006-07-30 05:15:52 -0700 (Sun, 30 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23632&view=rev

Log Message:
-----------
Added proper item selection handling for the ASK action

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2006-07-30 12:13:26 UTC (rev 23631)
+++ scummvm/trunk/engines/lure/game.cpp	2006-07-30 12:15:52 UTC (rev 23632)
@@ -348,15 +348,22 @@
 			breakFlag = true;
 			break;
 
+		case ASK:
+			hotspot = res.getHotspot(room.hotspotId());
+			strings.getString(hotspot->nameId, statusLine);
+			strcat(statusLine, " for ");
+			statusLine += strlen(statusLine);
+
+			itemId = PopupMenu::ShowItems(GET);
+			breakFlag = ((itemId != 0xffff) && (itemId != 0xfffe));
+			if (breakFlag)
+				hotspot = res.getHotspot(itemId);
+			break;
+
 		case GIVE:
 		case USE:
 		case EXAMINE:
 		case DRINK:
-			if (action == ASK) {
-				strings.getString(hotspot->nameId, statusLine);
-				strcat(statusLine, " for ");
-			}
-
 			hasItems = (res.numInventoryItems() != 0);
 			if (!hasItems)
 				strcat(statusLine, "(nothing)");


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





More information about the Scummvm-git-logs mailing list