diff options
| author | Paul Gilbert | 2007-12-07 08:16:52 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-12-07 08:16:52 +0000 |
| commit | f313c83ccdc9c0770b850a60ebb1ffb31a630cdd (patch) | |
| tree | a5b32a25e3cf8a765630bd99f536cd00bafbe976 /engines | |
| parent | 3c9c3fffc7d94f7e67b67a477437c012ba6c7787 (diff) | |
| download | scummvm-rg350-f313c83ccdc9c0770b850a60ebb1ffb31a630cdd.tar.gz scummvm-rg350-f313c83ccdc9c0770b850a60ebb1ffb31a630cdd.tar.bz2 scummvm-rg350-f313c83ccdc9c0770b850a60ebb1ffb31a630cdd.zip | |
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
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/hotspots.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |