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

[dreammaster at users.sourceforge.net]

Revision: 29480
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29480&view=rev
Author:   dreammaster
Date:     2007-11-12 01:16:00 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
Correction to delay when two NPCs are talking together

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-11 20:17:13 UTC (rev 29479)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-12 09:16:00 UTC (rev 29480)
@@ -2022,16 +2022,16 @@
 
 	// Handle the source's talk message
 	if (entry.param(1) != 0) {
-		converse(hotspot->hotspotId, entry.param(1));
-		resource()->talkCountdown += entry.param(2);
-		resource()->delayCtr = entry.param(2);
+		converse(hotspot->hotspotId, entry.param(1), true, false);
+		_data->talkCountdown += entry.param(2);
+		setDelayCtr(delayCtr() + entry.param(2));
 	}
 
 	// Handle the destination's response message
 	if (entry.param(3) != 0) {
 		Hotspot *destHotspot = res.getActiveHotspot(hotspot->hotspotId);
 		assert(destHotspot);
-		destHotspot->converse(this->hotspotId(), entry.param(3));
+		destHotspot->converse(this->hotspotId(), entry.param(3), true, false);
 	}
 
 	endAction();


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