[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.39,1.40 scummvm.cpp,2.24,2.25 verbs.cpp,1.16,1.17

Max Horn fingolfin at users.sourceforge.net
Mon Dec 30 19:33:01 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv12742

Modified Files:
	object.cpp scummvm.cpp verbs.cpp 
Log Message:
added V8 support to drawVerbBitmap - not even sure if that is used in COMI, though

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- object.cpp	31 Dec 2002 03:26:02 -0000	1.39
+++ object.cpp	31 Dec 2002 03:32:05 -0000	1.40
@@ -1189,13 +1189,10 @@
 	if (_features & GF_AFTER_V8) {
 		dataptr = findResource(MKID('IMAG'), foir.obim);
 		assert(dataptr);
-
 		dataptr = findResource(MKID('WRAP'), dataptr);
 		assert(dataptr);
-
 		dataptr = findResource(MKID('OFFS'), dataptr);
 		assert(dataptr);
-
 		dataptr += READ_LE_UINT32(dataptr + 4 + 4*imgindex);
 		// TODO - distinguish between SMAP and BOMP here?
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -d -r2.24 -r2.25
--- scummvm.cpp	31 Dec 2002 03:26:02 -0000	2.24
+++ scummvm.cpp	31 Dec 2002 03:32:06 -0000	2.25
@@ -752,7 +752,7 @@
 		assert(ptr);
 		ptr = findResource(MKID('OFFS'), ptr);
 		assert(ptr);
-		// Get the first SMAP resource (corresponds to IM00)
+		// Get the address of the first SMAP (corresponds to IM00)
 		ptr += READ_LE_UINT32(ptr + 8);
 		_IM00_offs = ptr - roomptr;
 	} else

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- verbs.cpp	29 Dec 2002 17:35:38 -0000	1.16
+++ verbs.cpp	31 Dec 2002 03:32:06 -0000	1.17
@@ -242,7 +242,18 @@
 			imgh = READ_LE_UINT16(&imhd->old.height) >> 3;
 		}
 
-		imptr = findResource(MKID('IM01'), obim);
+		if (_features & GF_AFTER_V8) {
+			warning("drawVerbBitmap(%d, %d, %d)", verb, x, y);
+			imptr = findResource(MKID('IMAG'), obim);
+			assert(imptr);
+			imptr = findResource(MKID('WRAP'), imptr);
+			assert(imptr);
+			imptr = findResource(MKID('OFFS'), imptr);
+			assert(imptr);
+			// Get the address of the second SMAP (corresponds to IM01)
+			imptr += READ_LE_UINT32(imptr + 12);
+		} else
+			imptr = findResource(MKID('IM01'), obim);
 		if (!imptr)
 			error("No image for verb %d", verb);
 	}





More information about the Scummvm-git-logs mailing list