[Scummvm-git-logs] scummvm master -> 456b2a4d6f8710b5feb813c3ccf5bf0be368197b

[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:
456b2a4d6f ULTIMA4: Avoid member shadowing warnings


Commit: 456b2a4d6f8710b5feb813c3ccf5bf0be368197b
    https://github.com/scummvm/scummvm/commit/456b2a4d6f8710b5feb813c3ccf5bf0be368197b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-14T06:26:40+09:00

Commit Message:
ULTIMA4: Avoid member shadowing warnings

Changed paths:
    engines/ultima/ultima4/filesys/savegame.h


diff --git a/engines/ultima/ultima4/filesys/savegame.h b/engines/ultima/ultima4/filesys/savegame.h
index 8e0750c42c..89cfbd63ba 100644
--- a/engines/ultima/ultima4/filesys/savegame.h
+++ b/engines/ultima/ultima4/filesys/savegame.h
@@ -240,8 +240,8 @@ public:
 	MapId _map;
 
 	LocationCoords() : Coords(), _map(0xff) {}
-	LocationCoords(MapId map, int x, int y, int z) :
-		Coords(x, y, z), _map(map) {}
+	LocationCoords(MapId map, int x_, int y_, int z_) :
+		Coords(x_, y_, z_), _map(map) {}
 	LocationCoords(MapId map, const Coords &pos) :
 		Coords(pos), _map(map) {}