Fix for bug #908434 (COMI: Using the ventriloquism book on Blondebeard acts weird)

svn-id: r14474
This commit is contained in:
Max Horn 2004-08-05 20:14:43 +00:00
parent a1480ba068
commit 378491faf9

View File

@ -1219,7 +1219,7 @@ void ScummEngine::actorTalk(const byte *msg) {
if ((_version <= 7 && !_keepText) || (_version == 8 && VAR(VAR_HAVE_MSG)))
stopTalk();
setTalkingActor(a->number);
if ((_version == 8) || (_version <= 7 && !_string[0].no_talk_anim)) {
if (!_string[0].no_talk_anim) {
a->runActorTalkScript(a->talkStartFrame);
_useTalkAnims = true;
}
@ -1275,7 +1275,7 @@ void ScummEngine::stopTalk() {
if (act && act < 0x80) {
Actor *a = derefActor(act, "stopTalk");
if (a->isInCurrentRoom()) {
if (_version == 8 || (_version == 7 && !_string[0].no_talk_anim) || (_version <= 6 && _useTalkAnims)) {
if ((_version >= 7 && !_string[0].no_talk_anim) || (_version <= 6 && _useTalkAnims)) {
a->runActorTalkScript(a->talkStopFrame);
_useTalkAnims = false;
}