diff options
| author | Max Horn | 2007-03-12 12:16:41 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-12 12:16:41 +0000 |
| commit | b3a14c635740b1516d0dd409da99ebd81b2a575e (patch) | |
| tree | 74276297b90863373a14c416784f98e4f7567160 /engines | |
| parent | f47670f5a38a3e32a56e94c9a67084cdeff87d48 (diff) | |
| download | scummvm-rg350-b3a14c635740b1516d0dd409da99ebd81b2a575e.tar.gz scummvm-rg350-b3a14c635740b1516d0dd409da99ebd81b2a575e.tar.bz2 scummvm-rg350-b3a14c635740b1516d0dd409da99ebd81b2a575e.zip | |
Fix a discrepancy between our V3 walking code and disasm (besides, using destbox instead of curbox was illogical, too)
svn-id: r26102
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 8c211ed59d..bbae60c560 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -655,7 +655,7 @@ void Actor_v3::walkActor() { if (calcMovementFactor(p3)) return; - setBox(_walkdata.destbox); + setBox(_walkdata.curbox); } while (1); _moving |= MF_LAST_LEG; @@ -1467,7 +1467,7 @@ void Actor::drawActorCostume(bool hitTestMode) { bcr->_clipOverride = _clipOverride; - if (_vm->_game.version == 4 && _boxscale & 0x8000) { + if (_vm->_game.version == 4 && (_boxscale & 0x8000)) { bcr->_scaleX = bcr->_scaleY = _vm->getScaleFromSlot((_boxscale & 0x7fff) + 1, _pos.x, _pos.y); } else { bcr->_scaleX = _scalex; |