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

Use image header to detect presence of the V8 flags field; rewrote that flags field to load the ObjectData.flags field differently; added a comment in saveload.cpp since we are not yet saving ObjectData.flags

Browse source 
svn-id: r15479
This commit is contained in:
Max Horn 2004-10-08 23:06:19 +00:00
parent 2611630f81
commit ca41dba220
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scumm/object.cpp
View file

@ -471,13 +471,7 @@ void ScummEngine::drawObject(int obj, int arg) {
}
if (numstrip != 0) {
byte flags;
if ((_gameId == GID_CMI) && !(_features & GF_DEMO))
flags = ((od.flag & 16) == 0) ? Gdi::dbAllowMaskOr : 0;
else if (_features & GF_HUMONGOUS)
flags = ((od.flag & 1) != 0) ? Gdi::dbAllowMaskOr : 0;
else
flags = Gdi::dbAllowMaskOr;
byte flags = od.flags;
if (_version == 1) {
gdi._C64ObjectMode = true;
@ -768,6 +762,8 @@ void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte *
error("Room %d missing CDHD blocks(s)", _roomResource);
imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), room + od->OBIMoffset);
od->flags = Gdi::dbAllowMaskOr;
if (_version == 8) {
od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
@ -780,8 +776,8 @@ void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte *
od->height = (uint)READ_LE_UINT32(&imhd->v8.height);
// HACK: This is done sinec an angle doesn't fit into a byte (360 > 256)
od->actordir = toSimpleDir(1, READ_LE_UINT32(&imhd->v8.actordir));
if (!(_features & GF_DEMO))
od->flag = (byte)READ_LE_UINT32(&imhd->v8.flag);
if (FROM_LE_32(imhd->v8.version) == 801)
od->flags = ((((byte)READ_LE_UINT32(&imhd->v8.flags)) & 16) == 0) ? Gdi::dbAllowMaskOr : 0;
} else if (_version == 7) {
od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
@ -809,7 +805,9 @@ void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte *
}
od->parent = cdhd->v6.parent;
od->actordir = cdhd->v6.actordir;
od->flag = imhd->old.flag;
if (_features & GF_HUMONGOUS)
od->flags = ((imhd->old.flags & 1) != 0) ? Gdi::dbAllowMaskOr : 0;
} else {
od->obj_nr = READ_LE_UINT16(&(cdhd->v5.obj_id));

6
scumm/object.h
View file

@ -37,7 +37,7 @@ struct ObjectData {
byte parentstate;
byte state;
byte fl_object_index;
byte flag;
byte flags;
};
#if !defined(__GNUC__)
@ -105,7 +105,7 @@ struct ImageHeader { /* file format */
uint16 obj_id;
uint16 image_count;
uint16 unk[1];
byte flag;
byte flags;
byte unk1;
uint16 unk2[2];
uint16 width;
@ -140,7 +140,7 @@ struct ImageHeader { /* file format */
uint32 width;
uint32 height;
uint32 actordir;
uint32 flag; // This field is missing in the COMI demo (version == 800) !
uint32 flags; // This field is missing in the COMI demo (version == 800) !
struct {
int32 x, y;
} GCC_PACK hotspot[15];

2
scumm/saveload.cpp
View file

@ -400,6 +400,8 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
MKLINE(ObjectData, parent, sleByte, VER(8)),
MKLINE(ObjectData, state, sleByte, VER(8)),
MKLINE(ObjectData, fl_object_index, sleByte, VER(8)),
// TODO
//MKLINE(ObjectData, flag, sleByte, VER(XXX)),
MKEND()
};