[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.57,2.58

Max Horn fingolfin at users.sourceforge.net
Sat Apr 26 03:45:02 CEST 2003


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

Modified Files:
	gfx.cpp 
Log Message:
proper fix for COMI regression

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.57
retrieving revision 2.58
diff -u -d -r2.57 -r2.58
--- gfx.cpp	26 Apr 2003 01:38:38 -0000	2.57
+++ gfx.cpp	26 Apr 2003 10:43:59 -0000	2.58
@@ -852,9 +852,8 @@
 
 	if (_disable_zbuffer)
 		numzbuf = 0;
-// 	FIXME what is this supposed to do? breaks comi
-//	else if (_numZBuffer <= 1)
-//		numzbuf = _numZBuffer;
+	else if (_numZBuffer <= 1)
+		numzbuf = _numZBuffer;
 	else {
 		numzbuf = _numZBuffer;
 		assert(numzbuf <= (int)ARRAYSIZE(zplane_list));
@@ -887,9 +886,6 @@
 			for (i = 1; i < numzbuf; i++) {
 				zplane_list[i] = zplnOffsChunkStart + READ_LE_UINT32(zplnOffsChunkStart + 4 + i*4) + 16;
 			}
-	
-			// A small hack to skip to the BSTR->WRAP->OFFS chunk
-			smap_ptr += 24;
 		} else {
 			const uint32 zplane_tags[] = {
 				MKID('ZP00'),
@@ -903,6 +899,12 @@
 				zplane_list[i] = findResource(zplane_tags[i], ptr);
 			}
 		}
+	}
+	
+	if (_vm->_features & GF_AFTER_V8) {	
+		// A small hack to skip to the BSTR->WRAP->OFFS chunk. Note: order matters, we do this
+		// *after* the Z buffer code because that assumes' the orginal value of smap_ptr. 
+		smap_ptr += 24;
 	}
 
 	bottom = y + h;





More information about the Scummvm-git-logs mailing list