aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/actor.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2009-04-05 07:52:21 +0000
committerPaul Gilbert2009-04-05 07:52:21 +0000
commit5f1c08505f3881b7154cca07731d911fe55b7741 (patch)
tree918edcbfdf603f20f905ee2b26098370015a1920 /engines/cruise/actor.cpp
parentd90a343790ca40933418ea75fa8ff702427dcbe2 (diff)
downloadscummvm-rg350-5f1c08505f3881b7154cca07731d911fe55b7741.tar.gz
scummvm-rg350-5f1c08505f3881b7154cca07731d911fe55b7741.tar.bz2
scummvm-rg350-5f1c08505f3881b7154cca07731d911fe55b7741.zip
Implemented many of the remaining library functions
svn-id: r39857
Diffstat (limited to 'engines/cruise/actor.cpp')
-rw-r--r--engines/cruise/actor.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index a52b97bc68..2ee8d5309a 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -88,9 +88,9 @@ void getPixel(int x, int y) {
y_min = *tableau++;
y_max = *tableau++;
- computedVar14 = *polygone++;
+ numPoly = *polygone++;
- if (walkboxState[computedVar14] == 0 && ((x >= x_min && x <= x_max) && (y >= y_min && y <= y_max))) {
+ if (walkboxState[numPoly] == 0 && ((x >= x_min && x <= x_max) && (y >= y_min && y <= y_max))) {
// click was in given box
int u = y - y_min;
tableau += u * 2;
@@ -98,7 +98,7 @@ void getPixel(int x, int y) {
x_max = *tableau++;
if ((x >= x_min && x <= x_max)) {
- flag_obstacle = walkboxColor[computedVar14];
+ flag_obstacle = walkboxColor[numPoly];
return;
}
@@ -627,7 +627,7 @@ int16 computePathfinding(MovementEntry &moveInfo, int16 x, int16 y, int16 destX,
*(ptr++) = moveInfo.y = destY;
*(ptr++) = -1;
- moveInfo.poly = computedVar14;
+ moveInfo.poly = numPoly;
perso->inc_droite = 0;
perso->inc_chemin = 0;
@@ -650,7 +650,7 @@ int16 computePathfinding(MovementEntry &moveInfo, int16 x, int16 y, int16 destX,
getPixel(x, y);
- moveInfo.poly = computedVar14;
+ moveInfo.poly = numPoly;
x_mouse = x;
y_mouse = y;
@@ -699,7 +699,7 @@ int16 computePathfinding(MovementEntry &moveInfo, int16 x, int16 y, int16 destX,
moveInfo.x = table_ptselect[1][0];
moveInfo.y = table_ptselect[1][1];
- moveInfo.poly = computedVar14;
+ moveInfo.poly = numPoly;
perso->inc_chemin = 0;
perso->inc_droite = 0;