aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-10 23:47:39 +0000
committerMax Horn2003-05-10 23:47:39 +0000
commitbf270d92432e44648d93598b8153b094e16ece3e (patch)
treebd540eaf3f2a91bb18455548fb2603cd5eefe38d /scumm/script_v2.cpp
parent5be0ce7adc9952ff065c7ec04cab4b87eb7b0e28 (diff)
downloadscummvm-rg350-bf270d92432e44648d93598b8153b094e16ece3e.tar.gz
scummvm-rg350-bf270d92432e44648d93598b8153b094e16ece3e.tar.bz2
scummvm-rg350-bf270d92432e44648d93598b8153b094e16ece3e.zip
walkbox & putActor coords in V2 are in 'character coordinates' - x has to multiplied by 8 and y by 2
svn-id: r7426
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 36eca65518..77312ef504 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -849,8 +849,8 @@ void Scumm_v2::o2_walkActorTo() {
int x, y;
Actor *a;
a = derefActorSafe(getVarOrDirectByte(0x80), "o2_walkActorTo");
- x = getVarOrDirectByte(0x40);
- y = getVarOrDirectByte(0x20);
+ x = getVarOrDirectByte(0x40) * 8;
+ y = getVarOrDirectByte(0x20) * 2;
a->ignoreBoxes = true; // FIXME: Disabling walkboxes
a->startWalkActor(x, y, -1); // for now, just to debug the intro
}
@@ -860,8 +860,8 @@ void Scumm_v2::o2_putActor() {
Actor *a;
a = derefActorSafe(getVarOrDirectByte(0x80), "o2_putActor");
- x = getVarOrDirectByte(0x40);
- y = getVarOrDirectByte(0x20);
+ x = getVarOrDirectByte(0x40) * 8;
+ y = getVarOrDirectByte(0x20) * 2;
if (!a)
return;
@@ -972,8 +972,8 @@ void Scumm_v2::o2_loadRoomWithEgo() {
a->putActor(0, 0, room);
_egoPositioned = false;
- x = (int16)fetchScriptByte();
- y = (int16)fetchScriptByte();
+ x = (int16)fetchScriptByte() * 8;
+ y = (int16)fetchScriptByte() * 2;
startScene(a->room, a, obj);
@@ -1139,11 +1139,11 @@ void Scumm_v2::o2_cursorCommand() {
if (a2 & 2) { // Cursor Show/Hide
if (a2 & 16)
- _cursor.state = 1;
+ _cursor.state = 1;
else
- _cursor.state = 0;
-
- verbMouseOver(0);
+ _cursor.state = 0;
+
+ verbMouseOver(0);
}
}