From f313c83ccdc9c0770b850a60ebb1ffb31a630cdd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Dec 2007 08:16:52 +0000
Subject: Fix for bug 1843961: Assertion on talking to a NPC - initial 'hey
 wait' dialog was resetting the destination character just before the
 conversation started

svn-id: r29743
---
 engines/lure/hotspots.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 9d87744610..c29682213f 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -986,6 +986,11 @@ HotspotPrecheckResult Hotspot::actionPrecheck(HotspotData *hotspot) {
 		hotspot->delayCtr = 30;
 		hotspot->actionHotspotId = _hotspotId;
 	}
+	
+	// If the player had called out to someone to wait, close down that talk dialog
+	if ((_hotspotId == PLAYER_ID) && (res.getTalkingCharacter() == PLAYER_ID)) 
+		Room::getReference().setTalkDialog(0, 0, 0, 0);
+
 	return PC_EXECUTE;
 }
 
-- 
cgit v1.2.3