thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup (yes, the parentstate was changed from 1 to 16 for V3/V4 games - but that actually seems to be correct, according to older comments in this file, and the disassmbly)

Browse source 
svn-id: r7175
This commit is contained in:
Max Horn 2003-04-28 12:38:24 +00:00
parent dabbbde957
commit a1a8c3ed05
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/object.cpp
View file

@ -633,6 +633,8 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) {
od->x_pos = *(ptr + 9) << 3;
od->y_pos = ((*(ptr + 10)) & 0x7F) << 3;
od->parentstate = (*(ptr + 10) & 0x80) ? 16 : 0;
od->width = *(ptr + 11) << 3;
od->parent = *(ptr + 12);
@ -642,18 +644,13 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) {
od->walk_y = *(ptr + 14);
od->actordir = (*(ptr + 15)) & 7;
od->height = *(ptr + 15) & 0xf8;
od->parentstate = (*(ptr + 10) & 0x80) >> 4;
} else {
od->walk_x = READ_LE_UINT16(ptr + 13);
od->walk_y = READ_LE_UINT16(ptr + 15);
od->actordir = (*(ptr + 17)) & 7;
od->height = *(ptr + 17) & 0xf8;
if (*(ptr + 10) & 0x80) {
od->parentstate = 1;
} else {
od->parentstate = 0;
}
}
return;
}