diff options
| author | James Brown | 2002-10-20 16:49:30 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-20 16:49:30 +0000 |
| commit | 13808c2a3b9e1153dccbcffe85bf2dfc5272ef9f (patch) | |
| tree | 0ef9e57bab7755e05a2a705e8f6082b520a81190 | |
| parent | f9c94f476ab609f7a5951d910239d2c0e2098b17 (diff) | |
| download | scummvm-rg350-13808c2a3b9e1153dccbcffe85bf2dfc5272ef9f.tar.gz scummvm-rg350-13808c2a3b9e1153dccbcffe85bf2dfc5272ef9f.tar.bz2 scummvm-rg350-13808c2a3b9e1153dccbcffe85bf2dfc5272ef9f.zip | |
Fix an infinite talking loop in The Dig. Again. :)
svn-id: r5202
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index c2f76991c4..f771d306e8 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() || (_features & GF_AFTER_V7)) && _useTalkAnims) { + if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_AFTER_V7)) { a->startAnimActor(a->talkFrame2); _useTalkAnims = false; } diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index ad3e5f067b..0ec566425f 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -3204,7 +3204,6 @@ void Scumm::decodeParseString2(int m, int n) _mixer->stop(_sound->_talkChannel); _sound->_talkChannel = _sound->playBundleSound(pointer); - printf("Talkchannel for %s is %d\n", transText, _sound->_talkChannel); _messagePtr = (byte*)&transText; switch (m) { |