[Scummvm-cvs-logs] SF.net SVN: scummvm: [30064] scummvm/branches/branch-0-11-0/engines/lure/ hotspots.cpp

[dreammaster at users.sourceforge.net]

Revision: 30064
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30064&view=rev
Author:   dreammaster
Date:     2007-12-28 15:03:26 -0800 (Fri, 28 Dec 2007)

Log Message:
-----------
Fix for correct dialog sequence when giving an object to an arbitrary NPC

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp

Modified: scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2007-12-28 22:56:22 UTC (rev 30063)
+++ scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2007-12-28 23:03:26 UTC (rev 30064)
@@ -1527,7 +1527,7 @@
 
 	if ((hotspot->hotspotId != PRISONER_ID) || (usedId != BOTTLE_HOTSPOT_ID)) 
 		showMessage(7, hotspot->hotspotId);
-	
+
 	uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, GIVE);
 
 	if (sequenceOffset >= 0x8000) {
@@ -1545,7 +1545,9 @@
 			HotspotData *usedItem = res.getHotspot(usedId);
 			usedItem->roomNumber = hotspot->hotspotId;
 		} else if (sequenceOffset > 1) {
-			showMessage(result);
+			Hotspot *destCharacter = res.getActiveHotspot(hotspot->hotspotId);
+			if (destCharacter != NULL)
+				destCharacter->showMessage(sequenceOffset, hotspotId());
 		}
 	}
 }


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