[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.369,2.370

[Travis Howell]

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

Modified Files:
	gfx.cpp 
Log Message:

Cleanup


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.369
retrieving revision 2.370
diff -u -d -r2.369 -r2.370
--- gfx.cpp	8 Oct 2004 09:43:33 -0000	2.369
+++ gfx.cpp	8 Oct 2004 10:49:30 -0000	2.370
@@ -1375,14 +1375,24 @@
 	// The following few lines more or less duplicate decompressBitmap(), only
 	// for an area spanning multiple strips. In particular, the codecs 13 & 14
 	// in decompressBitmap call drawStripHE()
-	if (code == 150) {
-		fill((byte *)vs->backBuf, vs->pitch, *bmap_ptr, vs->w, vs->h);
-	} else if ((code >= 134 && code <= 138) || (code >= 144 && code <= 148)) {
-		_decomp_shr = code % 10;
-		_decomp_mask = 0xFF >> (8 - _decomp_shr);
-
+	_decomp_shr = code % 10;
+	_decomp_mask = 0xFF >> (8 - _decomp_shr);
+	code /= 10;
+		
+	switch (code) {
+	case 13:	
+		drawStripHE((byte *)vs->backBuf, vs->pitch, bmap_ptr, vs->w, vs->h, false);
+		break;
+	case 14:
 		drawStripHE((byte *)vs->backBuf, vs->pitch, bmap_ptr, vs->w, vs->h, true);
+		break;
+	case 15:
+		fill((byte *)vs->backBuf, vs->pitch, *bmap_ptr, vs->w, vs->h);
+		break;
+	default:
+		error("Gdi::drawBMAPBg: default case %d", code);
 	}
+
 	copyVirtScreenBuffers(Common::Rect(vs->w, vs->h));
 
 	int numzbuf = getZPlanes(ptr, zplane_list, true);