thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a discrepancy between our V3 walking code and disasm (besides, using destbox instead of curbox was illogical, too)

Browse source 
svn-id: r26102
This commit is contained in:
Max Horn 2007-03-12 12:16:41 +00:00
parent f47670f5a3
commit b3a14c6357
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/actor.cpp
View file

@ -655,7 +655,7 @@ void Actor_v3::walkActor() {
if (calcMovementFactor(p3)) if (calcMovementFactor(p3))
return; return;
setBox(_walkdata.destbox); setBox(_walkdata.curbox);
} while (1); } while (1);
_moving |= MF_LAST_LEG; _moving |= MF_LAST_LEG;
@ -1467,7 +1467,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
bcr->_clipOverride = _clipOverride; 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); bcr->_scaleX = bcr->_scaleY = _vm->getScaleFromSlot((_boxscale & 0x7fff) + 1, _pos.x, _pos.y);
} else { } else {
bcr->_scaleX = _scalex; bcr->_scaleX = _scalex;