aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-10-02 07:25:46 +0200
committeruruk2013-10-02 07:26:17 +0200
commit4b93e2543548e994a2b8c25c6f1513d20b0beccf (patch)
treebcf3f6362c9641e0c61bcbcf0f2babeea5846916
parent546e911af998bb4948e4c930abfc731391d04509 (diff)
downloadscummvm-rg350-4b93e2543548e994a2b8c25c6f1513d20b0beccf.tar.gz
scummvm-rg350-4b93e2543548e994a2b8c25c6f1513d20b0beccf.tar.bz2
scummvm-rg350-4b93e2543548e994a2b8c25c6f1513d20b0beccf.zip
AVALANCHE: Repair shadowed variable.
-rw-r--r--engines/avalanche/graphics.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 4c398dfd20..ff998a0534 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -588,14 +588,14 @@ void GraphicManager::drawSign(Common::String fn, int16 xl, int16 yl, int16 y) {
sign.create(width, height, Graphics::PixelFormat::createFormatCLUT8());
// Produce the picture. We read it in row-by-row, and every row has 4 planes.
- for (int y = 0; y < height; y++) {
+ for (int yy = 0; yy < height; yy++) {
for (int8 plane = 0; plane < 4; plane++) { // The planes are in the "right" order.
- for (uint16 x = 0; x < width; x += 8) {
+ for (uint16 xx = 0; xx < width; xx += 8) {
byte pixel = file.readByte();
for (int bit = 0; bit < 8; bit++) {
byte pixelBit = (pixel >> bit) & 1;
if (pixelBit != 0)
- *(byte *)sign.getBasePtr(x + 7 - bit, y) += (pixelBit << plane);
+ *(byte *)sign.getBasePtr(xx + 7 - bit, yy) += (pixelBit << plane);
}
}
}