[Scummvm-git-logs] scummvm master -> 76dabbc8d4f2e089ad984a273ab60e3c94e5395c

[mduggan]

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:
76dabbc8d4 MM: MM1: Fix varible shadowing warning


Commit: 76dabbc8d4f2e089ad984a273ab60e3c94e5395c
    https://github.com/scummvm/scummvm/commit/76dabbc8d4f2e089ad984a273ab60e3c94e5395c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-02-13T17:37:11+09:00

Commit Message:
MM: MM1: Fix varible shadowing warning

Changed paths:
    engines/mm/mm1/data/character.cpp


diff --git a/engines/mm/mm1/data/character.cpp b/engines/mm/mm1/data/character.cpp
index bf10e525af3..d867789e69c 100644
--- a/engines/mm/mm1/data/character.cpp
+++ b/engines/mm/mm1/data/character.cpp
@@ -230,8 +230,8 @@ void Character::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_portrait);
 
 	if (s.isLoading() && g_engine->isEnhanced()) {
-		Common::String name = Common::String::format("char%02d.fac", _portrait + 1);
-		_faceSprites.load(name);
+		Common::String cname = Common::String::format("char%02d.fac", _portrait + 1);
+		_faceSprites.load(cname);
 	}
 }