aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-05-22 15:30:27 +0000
committerMax Horn2003-05-22 15:30:27 +0000
commit10fad2635a88db971dfac9d22961e2a99e890f20 (patch)
tree91f8fd680004f361e2decf06784a9cfec78096e0 /scumm
parent871df7fb57d18ec72e787cf3cbb9c719a386eaee (diff)
downloadscummvm-rg350-10fad2635a88db971dfac9d22961e2a99e890f20.tar.gz
scummvm-rg350-10fad2635a88db971dfac9d22961e2a99e890f20.tar.bz2
scummvm-rg350-10fad2635a88db971dfac9d22961e2a99e890f20.zip
not needed anymore since we read the preposition flag directly from the obcd data again
svn-id: r7830
Diffstat (limited to 'scumm')
-rw-r--r--scumm/object.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 5c2db5cb96..c803dac960 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -240,9 +240,6 @@ void Scumm::getObjectXYPos(int object, int &x, int &y, int &dir) {
x = od->x_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].x);
y = od->y_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].y);
}
- } else if (_features & GF_AFTER_V2){
- x = od->walk_x * 8;
- y = (od->walk_y & 0x1f) * 8;
} else {
x = od->walk_x;
y = od->walk_y;
@@ -696,11 +693,8 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) {
od->parent = *(ptr + 12);
if (_features & GF_AFTER_V2) {
- od->walk_x = *(ptr + 13);
- // V2 stores an as of now unknown value in the upper 3 bits of the Y coordinate.
- // Maybe we shoudl add an entry for it to ObjectData. That would be cleaner,
- // but requires us to inc the savegame format version.
- od->walk_y = *(ptr + 14);
+ od->walk_x = *(ptr + 13) * 8;
+ od->walk_y = (*(ptr + 14) & 0x1f) * 8;
od->actordir = (*(ptr + 15)) & 7;
od->height = *(ptr + 15) & 0xf8;
} else {