[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.357,2.358 object.h,1.13,1.14 scumm.cpp,1.245,1.246

Travis Howell kirben at users.sourceforge.net
Mon Oct 4 05:21:17 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7061/scumm

Modified Files:
	gfx.cpp object.h scumm.cpp 
Log Message:

COMI stores room transparency in RMHD.
Minor cleanup.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.357
retrieving revision 2.358
diff -u -d -r2.357 -r2.358
--- gfx.cpp	3 Oct 2004 17:25:24 -0000	2.357
+++ gfx.cpp	4 Oct 2004 12:16:51 -0000	2.358
@@ -1385,7 +1385,7 @@
 	byte *mask_ptr;
 	const byte *zplane_list[9];
 
-	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
+	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
 
 	if (bmap_ptr == NULL) {
 		error("Gdi::drawBMAPBg: Room %d has no compressed bitmap?", _vm->_roomResource);
@@ -1430,7 +1430,7 @@
 
 	warning("drawBMAPObject() called");
 
-	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
+	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
 	if (bmap_ptr == NULL) {
 		error("Gdi::drawBMAPObject: No image for item %d?", obj);
 		return;

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- object.h	26 Sep 2004 15:25:58 -0000	1.13
+++ object.h	4 Oct 2004 12:16:52 -0000	1.14
@@ -62,7 +62,7 @@
 			uint32 width, height;
 			uint32 numObjects;
 			uint32 numZBuffer;
-			uint32 unk2;
+			uint32 transparency;
 		} GCC_PACK v8;
 	} GCC_PACK;
 } GCC_PACK;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- scumm.cpp	4 Oct 2004 04:04:37 -0000	1.245
+++ scumm.cpp	4 Oct 2004 12:16:52 -0000	1.246
@@ -2287,14 +2287,14 @@
 	}
 
 	// Transparent color
-	if (_features & GF_OLD_BUNDLE)
+	if (_version == 8)
+		gdi._transparentColor = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
+	else if (_features & GF_OLD_BUNDLE)
 		gdi._transparentColor = 255;
 	else {
 		ptr = findResourceData(MKID('TRNS'), roomptr);
 		if (ptr)
 			gdi._transparentColor = ptr[0];
-		else if (_version == 8)
-			gdi._transparentColor = 5;
 		else
 			gdi._transparentColor = 255;
 	}





More information about the Scummvm-git-logs mailing list