[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.481,2.482

kirben kirben at users.sourceforge.net
Sun Jan 1 01:57:01 CET 2006


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

Modified Files:
	gfx.cpp 
Log Message:

Rename variable.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.481
retrieving revision 2.482
diff -u -d -r2.481 -r2.482
--- gfx.cpp	1 Jan 2006 09:51:06 -0000	2.481
+++ gfx.cpp	1 Jan 2006 09:55:56 -0000	2.482
@@ -1371,7 +1371,7 @@
 	int bottom;
 	int numzbuf;
 	int sx;
-	bool useOrDecompress = false;
+	bool transpStrip = false;
 
 	// Check whether lights are turned on or not
 	const bool lightsOn = _vm->isLightOn();
@@ -1492,7 +1492,7 @@
 				error("drawBitmap: Trying to draw a non-existant strip");
 				return;
 			}
-			useOrDecompress = decompressBitmap(dstPtr, vs->pitch, smap_ptr + offset, height);
+			transpStrip = decompressBitmap(dstPtr, vs->pitch, smap_ptr + offset, height);
 		}
 
 		CHECK_HEAP;
@@ -1507,7 +1507,7 @@
 
 		// COMI and HE games only uses flag value
 		if (_vm->_version == 8 || _vm->_heversion >= 60)
-			useOrDecompress = true;
+			transpStrip = true;
 
 		if (_vm->_version == 1) {
 			mask_ptr = getMaskBuffer(x + k, y, 1);
@@ -1541,7 +1541,7 @@
 				z_plane_ptr = zplane_list[1] + READ_LE_UINT16(zplane_list[1] + stripnr * 2 + 8);
 			for (i = 0; i < numzbuf; i++) {
 				mask_ptr = getMaskBuffer(x + k, y, i);
-				if (useOrDecompress && (flag & dbAllowMaskOr))
+				if (transpStrip && (flag & dbAllowMaskOr))
 					decompressMaskImgOr(mask_ptr, z_plane_ptr, height);
 				else
 					decompressMaskImg(mask_ptr, z_plane_ptr, height);
@@ -1572,14 +1572,14 @@
 					if (tmsk_ptr) {
 						const byte *tmsk = tmsk_ptr + READ_LE_UINT16(tmsk_ptr + 8);
 						decompressTMSK(mask_ptr, tmsk, z_plane_ptr, height);
-					} else if (useOrDecompress && (flag & dbAllowMaskOr)) {
+					} else if (transpStrip && (flag & dbAllowMaskOr)) {
 						decompressMaskImgOr(mask_ptr, z_plane_ptr, height);
 					} else {
 						decompressMaskImg(mask_ptr, z_plane_ptr, height);
 					}
 
 				} else {
-					if (!(useOrDecompress && (flag & dbAllowMaskOr)))
+					if (!(transpStrip && (flag & dbAllowMaskOr)))
 						for (int h = 0; h < height; h++)
 							mask_ptr[h * _numStrips] = 0;
 					// FIXME: needs better abstraction
@@ -1767,7 +1767,7 @@
 	}
 
 	byte code = *src++;
-	bool useOrDecompress = false;
+	bool transpStrip = false;
 	
 	if ((_vm->_platform == Common::kPlatformAmiga) && (_vm->_version >= 4))
 		_paletteMod = 16;
@@ -1798,7 +1798,7 @@
 	
 		case 8:
 			// Used in 3DO versions of HE games
-			useOrDecompress = true;
+			transpStrip = true;
 			drawStrip3DO(dst, dstPitch, src, numLinesToProcess, true);
 			break;
 	
@@ -1840,7 +1840,7 @@
 		case 36:
 		case 37:
 		case 38:
-			useOrDecompress = true;
+			transpStrip = true;
 			drawStripBasicV(dst, dstPitch, src, numLinesToProcess, true);
 			break;
 	
@@ -1849,7 +1849,7 @@
 		case 46:
 		case 47:
 		case 48:
-			useOrDecompress = true;
+			transpStrip = true;
 			drawStripBasicH(dst, dstPitch, src, numLinesToProcess, true);
 			break;
 	
@@ -1876,7 +1876,7 @@
 		case 126:
 		case 127:
 		case 128:
-			useOrDecompress = true;
+			transpStrip = true;
 			drawStripComplex(dst, dstPitch, src, numLinesToProcess, true);
 			break;
 	
@@ -1893,7 +1893,7 @@
 		case 146:
 		case 147:
 		case 148:
-			useOrDecompress = true;
+			transpStrip = true;
 			drawStripHE(dst, dstPitch, src, 8, numLinesToProcess, true);
 			break;
 
@@ -1906,7 +1906,7 @@
 		}
 	}
 	
-	return useOrDecompress;
+	return transpStrip;
 }
 
 void Gdi::decompressMaskImg(byte *dst, const byte *src, int height) const {





More information about the Scummvm-git-logs mailing list