aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-18 23:14:21 +0000
committerMax Horn2003-05-18 23:14:21 +0000
commit1f8d481acbcd0eac2c3b4165bc1fd01afe1d056b (patch)
tree66b18669d4c44ed188450a7f068d0302b393a860 /scumm/actor.cpp
parent5ac005860c3444ee881a2a448aa7481bdc37851b (diff)
downloadscummvm-rg350-1f8d481acbcd0eac2c3b4165bc1fd01afe1d056b.tar.gz
scummvm-rg350-1f8d481acbcd0eac2c3b4165bc1fd01afe1d056b.tar.bz2
scummvm-rg350-1f8d481acbcd0eac2c3b4165bc1fd01afe1d056b.zip
fix for various regressions (not quite sure if the check for V2/v3 is right, but seems to work so far)
svn-id: r7648
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index e6f4b0bddc..c8baf995e9 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1196,8 +1196,12 @@ void Actor::setActorCostume(int c) {
void Actor::startWalkActor(int destX, int destY, int dir) {
AdjustBoxResult abr;
- abr.x = destX;
- abr.y = destY;
+ if (_vm->_features & GF_AFTER_V2 || _vm->_features & GF_AFTER_V3) {
+ abr.x = destX;
+ abr.y = destY;
+ } else {
+ abr = adjustXYToBeInBox(destX, destY, walkbox);
+ }
if (!isInCurrentRoom()) {
x = abr.x;