aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/actor.cpp
diff options
context:
space:
mode:
authorVincent Hamm2007-10-27 18:15:38 +0000
committerVincent Hamm2007-10-27 18:15:38 +0000
commitcc9b0844b922aa62ba6086f3829a28a7de1a130b (patch)
tree0884adcfb39467a200f85959d34e0814053219ca /engines/cruise/actor.cpp
parent01e88f1fbf1f456d74990cd0a0b8950c056c06f4 (diff)
downloadscummvm-rg350-cc9b0844b922aa62ba6086f3829a28a7de1a130b.tar.gz
scummvm-rg350-cc9b0844b922aa62ba6086f3829a28a7de1a130b.tar.bz2
scummvm-rg350-cc9b0844b922aa62ba6086f3829a28a7de1a130b.zip
Hooked inputs
Cleanup & fix in input management code svn-id: r29267
Diffstat (limited to 'engines/cruise/actor.cpp')
-rw-r--r--engines/cruise/actor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index c4af217117..57a2c0c1ca 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -580,7 +580,7 @@ void valide_noeud(int16 table[], int16 p, int *nclick, int16 solution0[20 + 3][2
}
}
-//computePathfinding(returnVar2, params.X, params.Y, var34, var35, currentActor->stepX, currentActor->stepY);
+//computePathfinding(returnVar2, params.X, params.Y, aniX, aniY, currentActor->stepX, currentActor->stepY);
int16 computePathfinding(int16 *pSolution, int16 x, int16 y, int16 destX,
int16 destY, int16 stepX, int16 stepY, int16 oldPathId) {
persoStruct *perso;
@@ -776,8 +776,8 @@ void processAnimation(void) {
if (((animationStart && !currentActor->flag) || (!animationStart && currentActor->x_dest != -1 && currentActor->y_dest != -1)) && (currentActor->type == 0)) {
// mouse animation
if (!animationStart) {
- var34 = currentActor->x_dest;
- var35 = currentActor->y_dest;
+ aniX = currentActor->x_dest;
+ aniY = currentActor->y_dest;
currentActor->x_dest = -1;
currentActor->y_dest = -1;
@@ -785,7 +785,7 @@ void processAnimation(void) {
currentActor->flag = 1;
}
- currentActor->pathId = computePathfinding(returnVar2, params.X, params.Y, var34, var35, currentActor->stepX, currentActor->stepY, currentActor->pathId);
+ currentActor->pathId = computePathfinding(returnVar2, params.X, params.Y, aniX, aniY, currentActor->stepX, currentActor->stepY, currentActor->pathId);
if (currentActor->pathId == -1) {
if ((currentActor->endDirection != -1) && (currentActor->endDirection != currentActor->startDirection)) {