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

[dreammaster at users.sourceforge.net]

Revision: 23693
Author:   dreammaster
Date:     2006-08-07 06:23:30 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23693&view=rev

Log Message:
-----------
Fixed item overwriting destination character in ASK action

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2006-08-07 13:21:15 UTC (rev 23692)
+++ scummvm/trunk/engines/lure/game.cpp	2006-08-07 13:23:30 UTC (rev 23693)
@@ -267,7 +267,7 @@
 
 	if (room.checkInTalkDialog()) {
 		// Close the active talk dialog
-		room.setTalkDialog(0, 0);
+		room.setTalkDialog(0, 0, 0, 0);
 	} else if (oldRoomNumber != 0) {
 		// Viewing a room remotely - handle returning to prior room
 		if ((room.roomNumber() != 35) || (fields.getField(87) == 0)) {
@@ -356,8 +356,6 @@
 
 			itemId = PopupMenu::ShowItems(GET);
 			breakFlag = ((itemId != 0xffff) && (itemId != 0xfffe));
-			if (breakFlag)
-				hotspot = res.getHotspot(itemId);
 			break;
 
 		case GIVE:


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