libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed actor walking for V2 games a bit; this fixes bug #774529 (Zak: Annie walking in funny places)

Browse Source 
svn-id: r10185
This commit is contained in:
Max Horn 2003-09-11 23:31:46 +00:00
parent 0161cd4bb8
commit 7be171f910
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scumm/actor.cpp
View File

@ -1402,17 +1402,17 @@ void Actor::walkActorOld() {
if (!moving)
return;
if (!(moving & MF_NEW_LEG)) {
if (moving & MF_IN_LEG && actorWalkStep())
return;
if (moving & MF_LAST_LEG) {
moving = 0;
startWalkAnim(3, walkdata.destdir);
return;
}
if (moving & MF_TURN) {
new_dir = updateActorDirection(false);
if (facing != new_dir)
@ -1421,7 +1421,7 @@ void Actor::walkActorOld() {
moving = 0;
return;
}
if (walkdata.point3.x != 32000) {
if (calcMovementFactor(walkdata.point3)) {
walkdata.point3.x = 32000;
@ -1429,7 +1429,7 @@ void Actor::walkActorOld() {
}
walkdata.point3.x = 32000;
}
setBox(walkdata.curbox);
moving &= MF_IN_LEG;
}
@ -1460,26 +1460,22 @@ void Actor::walkActorOld() {
walkdata.curbox = next_box;
/*
if (_vm->_version <= 2) {
_vm->getClosestPtOnBox(walkdata.curbox, x, y, p2.x, p2.y);
_vm->getClosestPtOnBox(walkbox, p2.x, p2.y, p3.x, p3.y);
} else {
*/
findPathTowardsOld(walkbox, next_box, walkdata.destbox, p2, p3);
if (p2.x == 32000 && p3.x == 32000) {
break;
}
if (p2.x != 32000) {
if (calcMovementFactor(p2)) {
walkdata.point3 = p3;
return;
findPathTowardsOld(walkbox, next_box, walkdata.destbox, p2, p3);
if (p2.x == 32000 && p3.x == 32000) {
break;
}
if (p2.x != 32000) {
if (calcMovementFactor(p2)) {
walkdata.point3 = p3;
return;
}
}
}
/*
}
*/
if (calcMovementFactor(p3))
return;