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

this is 100% equivalent to the old walkActorOld() code - I just made an equivalence transformation (anybody who doesn't believe that, I can show you step by step how to transform the code :-)

Browse Source 
svn-id: r7749
This commit is contained in:
Max Horn 2003-05-20 17:50:43 +00:00
parent 14273bad5e
commit 1f859e592f
1 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
scumm/actor.cpp
View File

@ -1329,13 +1329,14 @@ void Actor::walkActor() {
break;
box = _vm->getPathToDestBox(walkbox, walkdata.destbox);
if (box < 0 || box > 0xF0) {
if (box < 0) {
walkdata.destbox = walkbox;
moving |= MF_LAST_LEG;
return;
}
walkdata.curbox = box;
if (_vm->findPathTowards(this, walkbox, box, walkdata.destbox, foundPathX, foundPathY))
break;
@ -1356,23 +1357,50 @@ void Actor::walkActorOld() {
if (!moving)
return;
if (moving & MF_NEW_LEG) {
restart:
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)
setDirection(new_dir);
else
moving = 0;
return;
}
if (walkdata.point3x != 32000) {
if (calcMovementFactor(walkdata.point3x, walkdata.point3y)) {
walkdata.point3x = 32000;
return;
}
walkdata.point3x = 32000;
}
walkbox = walkdata.curbox;
moving &= MF_IN_LEG;
moving |= MF_NEW_LEG;
}
do {
moving &= ~MF_NEW_LEG;
if (walkbox == INVALID_BOX) {
walkbox = walkdata.destbox;
walkdata.curbox = walkdata.destbox;
moving |= MF_LAST_LEG;
calcMovementFactor(walkdata.destx, walkdata.desty);
return;
break;
}
if (walkbox == walkdata.destbox) {
moving |= MF_LAST_LEG;
calcMovementFactor(walkdata.destx, walkdata.desty);
return;
}
if (walkbox == walkdata.destbox)
break;
next_box = _vm->getPathToDestBox(walkbox, walkdata.destbox);
@ -1385,9 +1413,7 @@ void Actor::walkActorOld() {
_vm->findPathTowardsOld(this, walkbox, next_box, walkdata.destbox, gateLoc);
if (gateLoc[2].x == 32000 && gateLoc[3].x == 32000) {
moving |= MF_LAST_LEG;
calcMovementFactor(walkdata.destx, walkdata.desty);
return;
break;
}
if (gateLoc[2].x != 32000) {
@ -1402,40 +1428,10 @@ void Actor::walkActorOld() {
return;
walkbox = walkdata.destbox;
goto restart;
} while(1);
}
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)
setDirection(new_dir);
else
moving = 0;
return;
}
if (walkdata.point3x != 32000) {
if (calcMovementFactor(walkdata.point3x, walkdata.point3y)) {
walkdata.point3x = 32000;
return;
}
walkdata.point3x = 32000;
}
walkbox = walkdata.curbox;
moving &= MF_IN_LEG;
moving |= MF_NEW_LEG;
goto restart;
moving |= MF_LAST_LEG;
calcMovementFactor(walkdata.destx, walkdata.desty);
}
byte *Actor::getActorName() {