aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-03-14 12:35:57 +0000
committerTravis Howell2007-03-14 12:35:57 +0000
commit7d599d3242f269b0a2f327fe44b555ce3742b2ec (patch)
tree08b044ec7f3b79fb037da5b5ed2b67f670fbfd56
parent247117d9bacd6c6e89f73c140b9a3137a1ee70e1 (diff)
downloadscummvm-rg350-7d599d3242f269b0a2f327fe44b555ce3742b2ec.tar.gz
scummvm-rg350-7d599d3242f269b0a2f327fe44b555ce3742b2ec.tar.bz2
scummvm-rg350-7d599d3242f269b0a2f327fe44b555ce3742b2ec.zip
Add recent walk box changes to SCUMM0 too.
svn-id: r26132
-rw-r--r--engines/scumm/script_v0.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 42843fe947..78853ecbae 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -647,6 +647,9 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
startScene(a->_room, a, obj);
getObjectXYPos(obj, x, y, dir);
+ AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
+ x = r.x;
+ y = r.y;
a->putActor(x, y, _currentRoom);
a->setDirection(dir + 180);
@@ -742,9 +745,12 @@ void ScummEngine_v0::o_putActorAtObject() {
a = derefActor(getVarOrDirectByte(PARAM_1), "o_putActorAtObject");
obj = fetchScriptByte();
- if (whereIsObject(obj) != WIO_NOT_FOUND)
+ if (whereIsObject(obj) != WIO_NOT_FOUND) {
getObjectXYPos(obj, x, y);
- else {
+ AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
+ x = r.x;
+ y = r.y;
+ } else {
x = 30;
y = 60;
}