libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

adjusted V2 actor position to match original (MM) interpreter; tweaked adjustXYToBeInBox mod for V2 (so it's clear why it is needed)

Browse Source 
svn-id: r8952
This commit is contained in:
Max Horn 2003-07-12 17:53:22 +00:00
parent 8b27f60434
commit fd82895ff5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scumm/actor.cpp
View File

@ -627,7 +627,9 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY) {
if (numBoxes < firstValidBox)
return abr;
bestDist = (_vm->_version <= 2) ? 0xFFFFFF : 0xFFFF;
bestDist = 0xFFFF;
if (_vm->_version <= 2)
bestDist *= 8*2; // Adjust for the fact that we multiply x by 8 and y by 2
bestBox = kInvalidBox;
// We iterate (backwards) over all boxes, searching the one closest
@ -902,14 +904,21 @@ void Actor::drawActorCostume() {
BaseCostumeRenderer* bcr = _vm->_costumeRenderer;
bcr->updateNbStrips ();
bcr->updateNbStrips();
bcr->_actorX = x - _vm->virtscr[0].xstart;
bcr->_actorY = y - elevation;
if (_vm->_version <= 2) {
// We have to adjust the x position by one strip (8 pixels) in V2 games
bcr->_actorX += 8;
// FIXME: We have to adjust the x position by one strip (8 pixels) in V2 games
// However, it is not quite clear to me why. And to fully match the original,
// it seems we have to offset by 2 strips when facing left (270 degree).
if (facing == 270)
bcr->_actorX += 16;
else
bcr->_actorX += 8;
}
bcr->_scaleX = scalex;
bcr->_scaleY = scaley;