From 6ccbfcf611e98e688ceae6947f9c4c06ca6336c9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 12 Nov 2007 09:16:00 +0000 Subject: [PATCH] Correction to delay when two NPCs are talking together svn-id: r29480 --- engines/lure/hotspots.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index 434b084afd2..8f86edbab40 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -2022,16 +2022,16 @@ void Hotspot::npcTalkNpcToNpc(HotspotData *hotspot) { // 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();