[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.98,1.99

[Max Horn]

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

Modified Files:
	gfx.cpp 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- gfx.cpp	30 Dec 2002 13:15:08 -0000	1.98
+++ gfx.cpp	30 Dec 2002 14:04:46 -0000	1.99
@@ -814,14 +814,8 @@
 
 	if (_vm->_features & GF_SMALL_HEADER) {
 		/* this is really ugly, FIXME */
-		if (ptr[-2] == 'B' && ptr[-1] == 'M' && READ_LE_UINT32(ptr - 6) > (READ_LE_UINT32(ptr) + 10)) {
-			zplane_list[1] = smap_ptr + READ_LE_UINT32(ptr);
-			// FIXME - how does GF_OLD256 encode the multiple zplanes?
-			if (!(_vm->_features & GF_OLD256))
-				for (i = 2; i < numzbuf; i++) {
-					zplane_list[i] = zplane_list[i-1] + READ_LE_UINT16(zplane_list[i-1]);
-			}
-		} else if (ptr[-4] == 'O' && ptr[-3] == 'I' && READ_LE_UINT32(ptr - 8) > READ_LE_UINT32(ptr) + 12) {
+		if ((ptr[-2] == 'B' && ptr[-1] == 'M' && READ_LE_UINT32(ptr - 6) > (READ_LE_UINT32(ptr) + 10)) ||
+		    (ptr[-4] == 'O' && ptr[-3] == 'I' && READ_LE_UINT32(ptr - 8) > READ_LE_UINT32(ptr) + 12)) {
 			zplane_list[1] = smap_ptr + READ_LE_UINT32(ptr);
 			// FIXME - how does GF_OLD256 encode the multiple zplanes?
 			if (!(_vm->_features & GF_OLD256))
@@ -946,12 +940,11 @@
 				if (!zplane_list[i])
 					continue;
 
-				if (_vm->_features & GF_SMALL_HEADER) {
-					if (_vm->_features & GF_OLD256)
-						offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 4);
-					else
-						offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);
-				} else if (_vm->_features & GF_AFTER_V8)
+				if (_vm->_features & GF_OLD256)
+					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 4);
+				else if (_vm->_features & GF_SMALL_HEADER)
+					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);
+				else if (_vm->_features & GF_AFTER_V8)
 					offs = READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
 				else
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8);