aboutsummaryrefslogtreecommitdiff
path: root/engines/access
diff options
context:
space:
mode:
authorD G Turner2018-07-29 03:19:53 +0100
committerD G Turner2018-07-29 03:19:53 +0100
commit275fc30f2716f742079574080d4260c8328b9401 (patch)
tree5fd528c36ddde581babb27ad46273a28c8890d8f /engines/access
parentf353e466df2175f10e4328bce3f6a44e295ba305 (diff)
downloadscummvm-rg350-275fc30f2716f742079574080d4260c8328b9401.tar.gz
scummvm-rg350-275fc30f2716f742079574080d4260c8328b9401.tar.bz2
scummvm-rg350-275fc30f2716f742079574080d4260c8328b9401.zip
ACCESS: MM: Fix Compiler Variable Shadowing Warning.
Diffstat (limited to 'engines/access')
-rw-r--r--engines/access/font.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index b098f256cb..487a9c25c4 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -200,8 +200,8 @@ void MartianFont::load(Common::SeekableReadStream &s) {
// Iterate through decoding each character
_chars.resize(count);
for (size_t idx = 0; idx < count; ++idx) {
- Graphics::Surface &s = _chars[idx];
- s.create(widths[idx], _height, Graphics::PixelFormat::createFormatCLUT8());
+ Graphics::Surface &surface = _chars[idx];
+ surface.create(widths[idx], _height, Graphics::PixelFormat::createFormatCLUT8());
const byte *srcP = &data[offsets[idx]];
int x1, y1, x2, y2;
@@ -209,14 +209,14 @@ void MartianFont::load(Common::SeekableReadStream &s) {
while ((x1 = *srcP++) != 0xff) {
x2 = *srcP++;
y1 = *srcP++;
- s.hLine(x1, y1, x2, 3);
+ surface.hLine(x1, y1, x2, 3);
}
// Write vertical lines
while ((x1 = *srcP++) != 0xff) {
y1 = *srcP++;
y2 = *srcP++;
- s.vLine(x1, y1, y2, 3);
+ surface.vLine(x1, y1, y2, 3);
}
}
}