[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.91,1.92 object.cpp,1.31,1.32 scumm.h,1.99,1.100

Max Horn fingolfin at users.sourceforge.net
Wed Dec 25 04:42:02 CET 2002


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

Modified Files:
	gfx.cpp object.cpp scumm.h 
Log Message:
fixed bomp cursor in CMI partially - still seeing flickering/tearing/artifacts, though

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- gfx.cpp	25 Dec 2002 12:01:00 -0000	1.91
+++ gfx.cpp	25 Dec 2002 12:41:40 -0000	1.92
@@ -3091,9 +3091,7 @@
 	_cursor.height = height;
 	_cursor.animate = 0;
 
-	// FIXME - why exactly the +10 ? Is that to account for block headers or something?
-	// Should be documented and verified that this is appropriate for V8 bomps, or not.
-	decompressBomp(_grabbedCursor, im + 10, width, height);
+	decompressBomp(_grabbedCursor, im, width, height);
 
 	updateCursor();
 }
@@ -3314,9 +3312,12 @@
 	int len, num;
 	byte code, color;
 
-
-	// FIXME - why this +8? To skip some kind of header? Is this right for V8 ?
-	src += 8;
+	// Skip the header
+	if (_features & GF_AFTER_V8) {
+		src += 16;
+	} else {
+		src += 18;
+	}
 
 	do {
 		len = w;

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- object.cpp	25 Dec 2002 12:14:42 -0000	1.31
+++ object.cpp	25 Dec 2002 12:41:41 -0000	1.32
@@ -1181,7 +1181,7 @@
 		// TODO - distinguish between SMAP and BOMP here?
 
 		// HACK - adjust dataptr here until bomp code gets adjusted for V8
-		bomp = dataptr + 2;
+		bomp = dataptr;
 	} else {
 		dataptr = findResource(IMxx_tags[imgindex], foir.obim);
 		if (dataptr == NULL)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- scumm.h	25 Dec 2002 12:01:03 -0000	1.99
+++ scumm.h	25 Dec 2002 12:41:41 -0000	1.100
@@ -559,7 +559,7 @@
 	bool isResourceLoaded(int type, int index);
 	void initRoomSubBlocks();
 	void loadRoomObjects();
-    	void loadRoomObjectsSmall();
+    void loadRoomObjectsSmall();
 	void readArrayFromIndexFile();
 	void readMAXS();
 	bool isGlobInMemory(int type, int index);





More information about the Scummvm-git-logs mailing list