[Scummvm-git-logs] scummvm master -> ab0edf1171a2a7731eb5ce738ef1984b473553df

[dreammaster]

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:
ab0edf1171 ULTIMA8: Fix shadowed local warning


Commit: ab0edf1171a2a7731eb5ce738ef1984b473553df
    https://github.com/scummvm/scummvm/commit/ab0edf1171a2a7731eb5ce738ef1984b473553df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-03-13T13:07:05-07:00

Commit Message:
ULTIMA8: Fix shadowed local warning

Changed paths:
    engines/ultima/ultima8/meta_engine.cpp


diff --git a/engines/ultima/ultima8/meta_engine.cpp b/engines/ultima/ultima8/meta_engine.cpp
index 05ec45888a..8d1af6dbb4 100644
--- a/engines/ultima/ultima8/meta_engine.cpp
+++ b/engines/ultima/ultima8/meta_engine.cpp
@@ -126,7 +126,7 @@ Common::KeymapArray MetaEngine::initKeymaps(bool isMenuActive) {
 		keymapArray.push_back(keyMap);
 
 		for (const KeybindingRecord *r = CHEAT_KEYS; r->_id; ++r) {
-			Common::Action *act = new Common::Action(r->_id, _(r->_desc));
+			act = new Common::Action(r->_id, _(r->_desc));
 			act->setCustomEngineActionEvent(r->_action);
 			act->addDefaultInputMapping(r->_key);
 			if (r->_joy)
@@ -140,7 +140,7 @@ Common::KeymapArray MetaEngine::initKeymaps(bool isMenuActive) {
 		keymapArray.push_back(keyMap);
 
 		for (const KeybindingRecord *r = DEBUG_KEYS; r->_id; ++r) {
-			Common::Action *act = new Common::Action(r->_id, _(r->_desc));
+			act = new Common::Action(r->_id, _(r->_desc));
 			act->setCustomEngineActionEvent(r->_action);
 			act->addDefaultInputMapping(r->_key);
 			if (r->_joy)