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

[dreammaster at users.sourceforge.net]

Revision: 26447
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26447&view=rev
Author:   dreammaster
Date:     2007-04-09 20:20:50 -0700 (Mon, 09 Apr 2007)

Log Message:
-----------
Bugfix to prevent a used item in give actions from not getting pased to the talk dialog for display

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-04-09 22:07:54 UTC (rev 26446)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-04-10 03:20:50 UTC (rev 26447)
@@ -1255,6 +1255,7 @@
 	ValueTableData &fields = res.fieldList();
 	fields.setField(ACTIVE_HOTSPOT_ID, hotspot->hotspotId);
 	fields.setField(USE_HOTSPOT_ID, usedId);
+	_data->useHotspotId = usedId;
 
 	if (usedHotspot->roomNumber != hotspotId()) {
 		// Item to be used is not in character's inventory - say "What???"
@@ -1899,9 +1900,9 @@
 	setTickProc(TALK_TICK_PROC_ID);    
 	
 	// Signal the character that they're being talked to
-	charHotspot->useHotspotId = _hotspotId;
-	setUseHotspotId(charHotspot->hotspotId);
-
+	charHotspot->talkDestCharacterId = _hotspotId;
+	_data->talkDestCharacterId = charHotspot->hotspotId;
+	
 	// Set the active talk data
 	res.setTalkStartEntry(0);
 	res.setTalkData(id);
@@ -2900,8 +2901,7 @@
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Player talk anim handler state = %d", res.getTalkState());
 	switch (res.getTalkState()) {
 	case TALK_NONE:
-		talkDestCharacter = h.useHotspotId();
-		h.setUseHotspotId(0);
+		talkDestCharacter = h.resource()->talkDestCharacterId;
 		assert(talkDestCharacter != 0);
 		// Fall through to TALK_START
 


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