[Scummvm-git-logs] scummvm master -> 275fc30f2716f742079574080d4260c8328b9401

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
275fc30f27 ACCESS: MM: Fix Compiler Variable Shadowing Warning.


Commit: 275fc30f2716f742079574080d4260c8328b9401
    https://github.com/scummvm/scummvm/commit/275fc30f2716f742079574080d4260c8328b9401
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-29T03:19:53+01:00

Commit Message:
ACCESS: MM: Fix Compiler Variable Shadowing Warning.

Changed paths:
    engines/access/font.cpp


diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index b098f25..487a9c2 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);
 		}
 	}
 }