aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/actor.cpp
diff options
context:
space:
mode:
authorVincent Hamm2007-10-28 14:41:37 +0000
committerVincent Hamm2007-10-28 14:41:37 +0000
commitfc961908c59790840008049a1d97e675376312f9 (patch)
tree5d6c4e2258c8b5ebd8888e90b882a8cea3a2efc9 /engines/cruise/actor.cpp
parent30b11df046134935133e788fffe6180c9600d199 (diff)
downloadscummvm-rg350-fc961908c59790840008049a1d97e675376312f9.tar.gz
scummvm-rg350-fc961908c59790840008049a1d97e675376312f9.tar.bz2
scummvm-rg350-fc961908c59790840008049a1d97e675376312f9.zip
Find object fix
Walk fix svn-id: r29291
Diffstat (limited to 'engines/cruise/actor.cpp')
-rw-r--r--engines/cruise/actor.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 57a2c0c1ca..be4d1a13f7 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -581,8 +581,7 @@ void valide_noeud(int16 table[], int16 p, int *nclick, int16 solution0[20 + 3][2
}
//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) {
+int16 computePathfinding(int16 *pSolution, int16 x, int16 y, int16 destX, int16 destY, int16 stepX, int16 stepY, int16 oldPathId) {
persoStruct *perso;
int num;
@@ -762,16 +761,15 @@ int raoul_invstat[][13] = {
void processAnimation(void) {
objectParamsQuery params;
int16 returnVar2[5];
- actorStruct *currentActor = &actorHead;
+ actorStruct *currentActor = actorHead.next;
actorStruct *nextActor;
while (currentActor) {
nextActor = currentActor->next;
- if (!currentActor->freeze && ((currentActor->type == 0)
- || (currentActor->type == 1))) {
- getMultipleObjectParam(currentActor->overlayNumber,
- currentActor->idx, &params);
+ if (!currentActor->freeze && ((currentActor->type == 0) || (currentActor->type == 1)))
+ {
+ getMultipleObjectParam(currentActor->overlayNumber, currentActor->idx, &params);
if (((animationStart && !currentActor->flag) || (!animationStart && currentActor->x_dest != -1 && currentActor->y_dest != -1)) && (currentActor->type == 0)) {
// mouse animation