aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorJames Brown2004-01-16 10:45:56 +0000
committerJames Brown2004-01-16 10:45:56 +0000
commitac5b7036c28a4137d4b7af7385d97e6e485f0767 (patch)
treeb9453259912d5f2c462d8107280ef83303e5fd14 /scumm/script_v6.cpp
parentbd3f51dfdfd563532a7cc228139dd60d8f6451a4 (diff)
downloadscummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.gz
scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.bz2
scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.zip
Fix for bug #862263 - Maniac actors never stop talking. I know this could probably be neater :)
svn-id: r12430
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index a8ccf68e6e..722afbcccd 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1069,7 +1069,7 @@ void ScummEngine_v6::o6_putActorAtXY() {
if (room == 0xFF || room == 0x7FFFFFFF) {
room = a->room;
} else {
- if (a->visible && _currentRoom != room && VAR(VAR_TALK_ACTOR) == a->number) {
+ if (a->visible && _currentRoom != room && talkingActor() == a->number) {
clearMsgQueue();
}
if (room != 0)