[Scummvm-git-logs] scummvm master -> 4e6b60948da049ad4b9e52965e5e20669d47d92d

[csnover]

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:
4e6b60948d SCUMM: Remove variable shadowing


Commit: 4e6b60948da049ad4b9e52965e5e20669d47d92d
    https://github.com/scummvm/scummvm/commit/4e6b60948da049ad4b9e52965e5e20669d47d92d
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-01-31T12:24:32-06:00

Commit Message:
SCUMM: Remove variable shadowing

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index db36553..ba852ed 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -991,13 +991,13 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncBytes(_charsetColorMap, 16, VER(8));
 
 	// _charsetData grew from 10*16, to 15*16, to 23*16 bytes
-	for (int i = 0; i < 10; ++i) {
+	for (i = 0; i < 10; ++i) {
 		s.syncBytes(_charsetData[i], 16, VER(8));
 	}
-	for (int i = 10; i < 15; ++i) {
+	for (; i < 15; ++i) {
 		s.syncBytes(_charsetData[i], 16, VER(10));
 	}
-	for (int i = 15; i < 23; ++i) {
+	for (; i < 23; ++i) {
 		s.syncBytes(_charsetData[i], 16, VER(67));
 	}