aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2007-11-12 09:16:00 +0000
committerPaul Gilbert2007-11-12 09:16:00 +0000
commit6ccbfcf611e98e688ceae6947f9c4c06ca6336c9 (patch)
tree47adeed910042e0109180fcfc03709c4cf491ef3
parentd2ee52abbae4c7346d1a24c1c1d3c01c452d267c (diff)
downloadscummvm-rg350-6ccbfcf611e98e688ceae6947f9c4c06ca6336c9.tar.gz
scummvm-rg350-6ccbfcf611e98e688ceae6947f9c4c06ca6336c9.tar.bz2
scummvm-rg350-6ccbfcf611e98e688ceae6947f9c4c06ca6336c9.zip
Correction to delay when two NPCs are talking together
svn-id: r29480
-rw-r--r--engines/lure/hotspots.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 434b084afd..8f86edbab4 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();