[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.367,2.368 object.cpp,1.201,1.202
Travis Howell
kirben at users.sourceforge.net
Fri Oct 8 00:39:26 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.293,2.294 script_v72he.cpp,2.157,2.158 script_v80he.cpp,2.49,2.50 script_v90he.cpp,2.82,2.83
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.368,2.369
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/scumm
Modified Files:
gfx.cpp object.cpp
Log Message:
Restrict to full game, since it doesn't exist in demo.
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.367
retrieving revision 2.368
diff -u -d -r2.367 -r2.368
--- gfx.cpp 7 Oct 2004 21:20:44 -0000 2.367
+++ gfx.cpp 8 Oct 2004 07:34:06 -0000 2.368
@@ -1406,11 +1406,7 @@
}
void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h) {
- const byte *bmap_ptr;
-
- warning("drawBMAPObject() called");
-
- bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+ const byte *bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
assert(bmap_ptr);
byte code = *bmap_ptr++;
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- object.cpp 7 Oct 2004 21:19:37 -0000 1.201
+++ object.cpp 8 Oct 2004 07:34:06 -0000 1.202
@@ -171,18 +171,14 @@
int ScummEngine::getObjectImageCount(int object) {
const byte *ptr;
const ImageHeader *imhd;
- int count, objnum;
+ int objnum;
objnum = getObjectIndex(object);
- if (objnum == -1)
- error("getObjectImageCount: object %d not in memory", object);
+ assert(objnum != -1);
ptr = getOBIMFromObject(_objs[objnum]);
imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
-
- count = READ_LE_UINT32(&imhd->v8.image_count);
- warning("getObjectImageCount: image count %d", count);
- return count;
+ return (READ_LE_UINT32(&imhd->v8.image_count));
}
int ScummEngine::whereIsObject(int object) const {
@@ -476,7 +472,7 @@
if (numstrip != 0) {
byte flags;
- if (_version == 8)
+ 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;
@@ -784,7 +780,8 @@
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));
- od->flag = (byte) READ_LE_UINT32(&imhd->v8.flag);
+ if (!(_features & GF_DEMO))
+ od->flag = (byte)READ_LE_UINT32(&imhd->v8.flag);
} else if (_version == 7) {
od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
@@ -796,7 +793,7 @@
od->y_pos = READ_LE_UINT16(&imhd->v7.y_pos);
od->width = READ_LE_UINT16(&imhd->v7.width);
od->height = READ_LE_UINT16(&imhd->v7.height);
- od->actordir = (byte) READ_LE_UINT16(&imhd->v7.actordir);
+ od->actordir = (byte)READ_LE_UINT16(&imhd->v7.actordir);
} else if (_version == 6) {
od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id));
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.293,2.294 script_v72he.cpp,2.157,2.158 script_v80he.cpp,2.49,2.50 script_v90he.cpp,2.82,2.83
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.368,2.369
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list