[Scummvm-git-logs] scummvm master -> 82b1f3603aa61a1697184b5b9ceb31e58568eb9f

[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:
82b1f3603a ULTIMA8: Fix GCC Shadowing Warning


Commit: 82b1f3603aa61a1697184b5b9ceb31e58568eb9f
    https://github.com/scummvm/scummvm/commit/82b1f3603aa61a1697184b5b9ceb31e58568eb9f
Author: D G Turner (digitall at scummvm.org)
Date: 2021-05-15T20:17:38+01:00

Commit Message:
ULTIMA8: Fix GCC Shadowing Warning

Changed paths:
    engines/ultima/ultima8/world/item_selection_process.cpp


diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index 2e9e6bcf80..4be8488818 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -95,8 +95,8 @@ bool ItemSelectionProcess::selectNextItem(bool grab) {
 
 			candidates.push_back(item);
 			if (grab) {
-				const ShapeInfo *info = item->getShapeInfo();
-				if (!info || !(info->_flags & ShapeInfo::SI_CRU_SELECTABLE)) {
+				const ShapeInfo *info_g = item->getShapeInfo();
+				if (!info_g || !(info_g->_flags & ShapeInfo::SI_CRU_SELECTABLE)) {
 					MainActor *actor = getMainActor();
 					if (actor)
 						actor->addItemCru(item, true);