diff options
author | Travis Howell | 2004-02-06 14:16:14 +0000 |
---|---|---|
committer | Travis Howell | 2004-02-06 14:16:14 +0000 |
commit | 2f290914699b743889bb62d0789d6a41c4066371 (patch) | |
tree | a1d6f957bf6cfc34f9d4128045e268e54b8ea638 /scumm | |
parent | 7ae1cc0f967a0859dc9c81db815d08ab760c21b1 (diff) | |
download | scummvm-rg350-2f290914699b743889bb62d0789d6a41c4066371.tar.gz scummvm-rg350-2f290914699b743889bb62d0789d6a41c4066371.tar.bz2 scummvm-rg350-2f290914699b743889bb62d0789d6a41c4066371.zip |
Used wrong check, might have caused regressions.
svn-id: r12747
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/actor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index b855c4e399..a3c5f53186 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1013,7 +1013,7 @@ void Actor::drawActorCostume() { // If the actor is partially hidden, redraw it next frame. // Only done for pre-AKOS, though. if (bcr->drawCostume(_vm->virtscr[0], cost) & 1) { - needRedraw = !(_vm->_version >= 7); + needRedraw = (_vm->_version <= 6); } // Record the vertical extent of the drawn actor @@ -1165,7 +1165,7 @@ void ScummEngine::actorTalk() { } a = derefActor(_actorToPrintStrFor, "actorTalk"); - if (!a->isInCurrentRoom() && !(_features & GF_NEW_COSTUMES)) { + if (!a->isInCurrentRoom() && (_version <= 6)) { oldact = 0xFF; } else { if (!_keepText) @@ -1211,10 +1211,10 @@ void ScummEngine::stopTalk() { a->startAnimActor(a->talkStopFrame); _useTalkAnims = false; } - if (!(_features & GF_NEW_COSTUMES)) + if (!(_features & GF_HUMONGOUS)) talkingActor(0xFF); } - if (_features & GF_NEW_COSTUMES) + if (_features & GF_HUMONGOUS) talkingActor(0); _keepText = false; _charset->restoreCharsetBg(); |