aboutsummaryrefslogtreecommitdiff
path: root/scumm/gfx.cpp
diff options
context:
space:
mode:
authorMax Horn2002-10-22 11:48:24 +0000
committerMax Horn2002-10-22 11:48:24 +0000
commit5151e561d504864a655b25512a933f3bf70bd3de (patch)
tree8a1c9e66bad22700749ee75f07adb39973f90958 /scumm/gfx.cpp
parent9f33d561a981203d5d482113b35b329da600ca0e (diff)
downloadscummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.tar.gz
scummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.tar.bz2
scummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.zip
fixing various warnings that occur with -Wshadow;some other minor cleanup
svn-id: r5239
Diffstat (limited to 'scumm/gfx.cpp')
-rw-r--r--scumm/gfx.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 39dce0d9b4..cd37ae83ee 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -985,8 +985,8 @@ void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, int h,
decompressMaskImg();
} else {
if (!(_useOrDecompress && flag & dbAllowMaskOr))
- for (int h = 0; h < _numLinesToProcess; h++)
- _mask_ptr_dest[h * NUM_STRIPS] = 0;
+ for (int height = 0; height < _numLinesToProcess; height++)
+ _mask_ptr_dest[height * NUM_STRIPS] = 0;
/* needs better abstraction, FIXME */
}
}