diff options
| author | James Brown | 2002-10-18 11:45:57 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-18 11:45:57 +0000 |
| commit | 80ce915f3da1173eb86af153d79a12aac556f564 (patch) | |
| tree | 4b23ee8da447cd1e5ff6a4cc3e82ddc2d0924897 /scumm/actor.cpp | |
| parent | d0565061a08d93b5fe545740bb37dbc83c12ddfe (diff) | |
| download | scummvm-rg350-80ce915f3da1173eb86af153d79a12aac556f564.tar.gz scummvm-rg350-80ce915f3da1173eb86af153d79a12aac556f564.tar.bz2 scummvm-rg350-80ce915f3da1173eb86af153d79a12aac556f564.zip | |
Fix Wait:forActorDraw and the 'infinite mouth movement' problem in The Dig.
Code assumed that the actor always starts talking in the same room it finishes talking in - this doesn't apply for several cutscene
sequences in The Dig. Also added the usual talkChannel fallback code in for The Dig.
svn-id: r5186
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 14c1ce7a8d..b36538d469 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -782,7 +782,7 @@ void Scumm::stopTalk() act = _vars[VAR_TALK_ACTOR]; if (act && act < 0x80) { Actor *a = derefActorSafe(act, "stopTalk"); - if (a->isInCurrentRoom() && _useTalkAnims) { + if ((a->isInCurrentRoom() || (_features & GF_AFTER_V7)) && _useTalkAnims) { a->startAnimActor(a->talkFrame2); _useTalkAnims = false; } |