aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir2006-12-21 15:18:26 +0000
committerGregory Montoir2006-12-21 15:18:26 +0000
commit487391edef421fb86e7ad853572eb1606d7776c7 (patch)
tree88c38492f231b542316bc5888acfd2cda570ab9e
parentcfd4ffb321112a311eb800077c4483d76a6d63d6 (diff)
downloadscummvm-rg350-487391edef421fb86e7ad853572eb1606d7776c7.tar.gz
scummvm-rg350-487391edef421fb86e7ad853572eb1606d7776c7.tar.bz2
scummvm-rg350-487391edef421fb86e7ad853572eb1606d7776c7.zip
passing the room as an argument to putActor is optionnal here
svn-id: r24911
-rw-r--r--engines/scumm/debugger.cpp4
-rw-r--r--engines/scumm/script_c64.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index b55817ab98..6ca16821e4 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -383,11 +383,11 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) {
a->_ignoreBoxes = (value > 0);
DebugPrintf("Actor[%d].ignoreBoxes = %d\n", actnum, a->_ignoreBoxes);
} else if (!strcmp(argv[2], "x")) {
- a->putActor(value, a->getPos().y, a->_room);
+ a->putActor(value, a->getPos().y);
DebugPrintf("Actor[%d].x = %d\n", actnum, a->getPos().x);
_vm->_fullRedraw = true;
} else if (!strcmp(argv[2], "y")) {
- a->putActor(a->getPos().x, value, a->_room);
+ a->putActor(a->getPos().x, value);
DebugPrintf("Actor[%d].y = %d\n", actnum, a->getPos().y);
_vm->_fullRedraw = true;
} else if (!strcmp(argv[2], "_elevation")) {
diff --git a/engines/scumm/script_c64.cpp b/engines/scumm/script_c64.cpp
index 25ca3d9de9..ee39414060 100644
--- a/engines/scumm/script_c64.cpp
+++ b/engines/scumm/script_c64.cpp
@@ -749,7 +749,7 @@ void ScummEngine_c64::o_putActorAtObject() {
y = 60;
}
- a->putActor(x, y, a->_room);
+ a->putActor(x, y);
}
void ScummEngine_c64::o_pickupObject() {