[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.173,1.174
Max Horn
fingolfin at users.sourceforge.net
Thu Sep 11 16:47:14 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv916
Modified Files:
actor.cpp
Log Message:
changed actor walking for V2 games a bit; this fixes bug #774529 (Zak: Annie walking in funny places)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- actor.cpp 11 Sep 2003 22:36:21 -0000 1.173
+++ actor.cpp 11 Sep 2003 23:31:46 -0000 1.174
@@ -1402,17 +1402,17 @@
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 @@
moving = 0;
return;
}
-
+
if (walkdata.point3.x != 32000) {
if (calcMovementFactor(walkdata.point3)) {
walkdata.point3.x = 32000;
@@ -1429,7 +1429,7 @@
}
walkdata.point3.x = 32000;
}
-
+
setBox(walkdata.curbox);
moving &= MF_IN_LEG;
}
@@ -1460,26 +1460,22 @@
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;
More information about the Scummvm-git-logs
mailing list