diff options
| author | Travis Howell | 2005-04-21 03:29:31 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-21 03:29:31 +0000 |
| commit | 261a02beec87957beec3775b930b7f53d4ba3574 (patch) | |
| tree | a82b8b595abd49818712eada97ea39c3dfe0fc3c /scumm/actor.cpp | |
| parent | 283a9f35ac294fa10105c7d8c18b57d7a2689e19 (diff) | |
| download | scummvm-rg350-261a02beec87957beec3775b930b7f53d4ba3574.tar.gz scummvm-rg350-261a02beec87957beec3775b930b7f53d4ba3574.tar.bz2 scummvm-rg350-261a02beec87957beec3775b930b7f53d4ba3574.zip | |
HE98+ includes extra VAR checks at this point.
Fixes salesmen freeze in freddi4.
svn-id: r17727
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index b0b095ad83..617aa7c63f 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1445,8 +1445,11 @@ void Actor::setActorCostume(int c) { _palette[i] = 0xFF; } - if (_vm->_heversion >= 72 && _vm->getTalkingActor() == _number) - _vm->setTalkingActor(0); + if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) { + if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) { + _vm->setTalkingActor(0); + } + } } void Actor::startWalkActor(int destX, int destY, int dir) { |