[Scummvm-git-logs] scummvm master -> 95182349f177ab9789528efe1ce2cd76503cb42b

[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:
95182349f1 ULTIMA8: Fix GCC Compiler Shadowing Warning


Commit: 95182349f177ab9789528efe1ce2cd76503cb42b
    https://github.com/scummvm/scummvm/commit/95182349f177ab9789528efe1ce2cd76503cb42b
Author: D G Turner (digitall at scummvm.org)
Date: 2022-01-01T17:15:15Z

Commit Message:
ULTIMA8: Fix GCC Compiler Shadowing Warning

Changed paths:
    engines/ultima/ultima8/gumps/game_map_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/game_map_gump.cpp b/engines/ultima/ultima8/gumps/game_map_gump.cpp
index 3b471f4185e..ee0a4bae0f3 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.cpp
+++ b/engines/ultima/ultima8/gumps/game_map_gump.cpp
@@ -321,8 +321,8 @@ void GameMapGump::onMouseClick(int button, int32 mx, int32 my) {
 			item->dumpInfo();
 
 #if 1
-			Actor *avatar = getControlledActor();
-			PathfinderProcess *pfp = new PathfinderProcess(avatar, xv, yv, zv);
+			Actor *avatarControlled = getControlledActor();
+			PathfinderProcess *pfp = new PathfinderProcess(avatarControlled, xv, yv, zv);
 			Kernel::get_instance()->addProcess(pfp);
 #elif 0
 			if (dynamic_cast<Actor *>(item)) {