diff options
author | Travis Howell | 2006-01-01 09:55:56 +0000 |
---|---|---|
committer | Travis Howell | 2006-01-01 09:55:56 +0000 |
commit | e66fe0270dc4f6f04ff15b4380ea8763f41f43fb (patch) | |
tree | f4518037d3499442185ae13bd8b45abe540e973f /scumm | |
parent | 67ac79c5aa0ffd9d672f4b23dbbce3bba1b608c3 (diff) | |
download | scummvm-rg350-e66fe0270dc4f6f04ff15b4380ea8763f41f43fb.tar.gz scummvm-rg350-e66fe0270dc4f6f04ff15b4380ea8763f41f43fb.tar.bz2 scummvm-rg350-e66fe0270dc4f6f04ff15b4380ea8763f41f43fb.zip |
Rename variable.
svn-id: r19874
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/gfx.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index a91cf87f2c..908162926b 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1371,7 +1371,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi 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 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi 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 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi // 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 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi 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 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi 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 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine } byte code = *src++; - bool useOrDecompress = false; + bool transpStrip = false; if ((_vm->_platform == Common::kPlatformAmiga) && (_vm->_version >= 4)) _paletteMod = 16; @@ -1798,7 +1798,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine case 8: // Used in 3DO versions of HE games - useOrDecompress = true; + transpStrip = true; drawStrip3DO(dst, dstPitch, src, numLinesToProcess, true); break; @@ -1840,7 +1840,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine case 36: case 37: case 38: - useOrDecompress = true; + transpStrip = true; drawStripBasicV(dst, dstPitch, src, numLinesToProcess, true); break; @@ -1849,7 +1849,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine case 46: case 47: case 48: - useOrDecompress = true; + transpStrip = true; drawStripBasicH(dst, dstPitch, src, numLinesToProcess, true); break; @@ -1876,7 +1876,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine case 126: case 127: case 128: - useOrDecompress = true; + transpStrip = true; drawStripComplex(dst, dstPitch, src, numLinesToProcess, true); break; @@ -1893,7 +1893,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine case 146: case 147: case 148: - useOrDecompress = true; + transpStrip = true; drawStripHE(dst, dstPitch, src, 8, numLinesToProcess, true); break; @@ -1906,7 +1906,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine } } - return useOrDecompress; + return transpStrip; } void Gdi::decompressMaskImg(byte *dst, const byte *src, int height) const { |