aboutsummaryrefslogtreecommitdiff
path: root/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2002-07-16 18:51:27 +0000
committerMax Horn2002-07-16 18:51:27 +0000
commit32e81beb4567d6d8b58fa583558082e8b42ccb42 (patch)
tree36ade7b1fa124d7a8828c36407c14eaebb7b8e59 /actor.cpp
parent0d943903c748fbaf7e780b9c94b31d69d523618c (diff)
downloadscummvm-rg350-32e81beb4567d6d8b58fa583558082e8b42ccb42.tar.gz
scummvm-rg350-32e81beb4567d6d8b58fa583558082e8b42ccb42.tar.bz2
scummvm-rg350-32e81beb4567d6d8b58fa583558082e8b42ccb42.zip
got rid of _xPos, _yPos, _dir members in class Scumm
svn-id: r4578
Diffstat (limited to 'actor.cpp')
-rw-r--r--actor.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/actor.cpp b/actor.cpp
index 1d1e56039f..742b9a8269 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -548,15 +548,13 @@ void Scumm::putActor(Actor *a, int dstX, int dstY, byte room)
}
}
-int Scumm::getActorXYPos(Actor *a)
+int Actor::getActorXYPos(int &xPos, int &yPos)
{
- if (!a)
+ if (!isInCurrentRoom())
return -1;
- if (!a->isInCurrentRoom())
- return -1;
- _xPos = a->x;
- _yPos = a->y;
+ xPos = x;
+ yPos = y;
return 0;
}