aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/res.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2007-04-19 06:46:56 +0000
committerPaul Gilbert2007-04-19 06:46:56 +0000
commitfdea5abb34a8a00a4dfd02e8081aa550e43bedb7 (patch)
tree775eacf9de8bff7dfe7b48d783fc85937e8a93a9 /engines/lure/res.cpp
parenta3bde14ead0d99557b5f8fb241b2f70a54e0a718 (diff)
downloadscummvm-rg350-fdea5abb34a8a00a4dfd02e8081aa550e43bedb7.tar.gz
scummvm-rg350-fdea5abb34a8a00a4dfd02e8081aa550e43bedb7.tar.bz2
scummvm-rg350-fdea5abb34a8a00a4dfd02e8081aa550e43bedb7.zip
Added code to prevent NPCs from moving when being talked to
svn-id: r26546
Diffstat (limited to 'engines/lure/res.cpp')
-rw-r--r--engines/lure/res.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index dc36e60f3e..c6517a3970 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -445,6 +445,13 @@ void Resources::setTalkingCharacter(uint16 id) {
HotspotData *charHotspot = res.getHotspot(_talkingCharacter);
assert(charHotspot);
charHotspot->talkCountdown = 0;
+
+ if (charHotspot->talkDestCharacterId != 0) {
+ HotspotData *destHotspot = res.getHotspot(charHotspot->talkDestCharacterId);
+ if (destHotspot != NULL)
+ destHotspot->talkDestCharacterId = 0;
+ }
+ charHotspot->talkDestCharacterId = 0;
}
_talkingCharacter = id;