[Scummvm-git-logs] scummvm master -> 8a78c1003b2330f1497aa9dfc81ee3a7de7d7086

digitall noreply at scummvm.org
Fri Mar 3 14:03:38 UTC 2023


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:
8a78c1003b TETRAEDGE: Fix GCC Compiler Shadowing Warning


Commit: 8a78c1003b2330f1497aa9dfc81ee3a7de7d7086
    https://github.com/scummvm/scummvm/commit/8a78c1003b2330f1497aa9dfc81ee3a7de7d7086
Author: D G Turner (digitall at scummvm.org)
Date: 2023-03-03T14:02:49Z

Commit Message:
TETRAEDGE: Fix GCC Compiler Shadowing Warning

Changed paths:
    engines/tetraedge/game/credits.cpp


diff --git a/engines/tetraedge/game/credits.cpp b/engines/tetraedge/game/credits.cpp
index 394151ce5a0..282c97230ea 100644
--- a/engines/tetraedge/game/credits.cpp
+++ b/engines/tetraedge/game/credits.cpp
@@ -69,7 +69,6 @@ void Credits::enter(bool returnToOptions) {
 	anchorAnim->_callbackMethod = &TeLayout::setAnchor;
 	anchorAnim->play();
 
-	TeCurveAnim2<TeLayout, TeVector3f32> *bgPosAnim = nullptr;
 	if (g_engine->gameType() == TetraedgeEngine::kSyberia) {
 		TeCurveAnim2<TeLayout, TeVector3f32> *bgPosAnim = _gui.layoutPositionLinearAnimation("scrollBackgroundPositionAnim");
 		if (!bgPosAnim)
@@ -105,7 +104,7 @@ void Credits::enter(bool returnToOptions) {
 			_curveAnim.play();
 			bgchild->setVisible(true);
 			const Common::String bgAnimName = bgchild->name() + "Anim";
-			bgPosAnim = _gui.layoutPositionLinearAnimation(bgAnimName);
+			TeCurveAnim2<TeLayout, TeVector3f32> *bgPosAnim = _gui.layoutPositionLinearAnimation(bgAnimName);
 			if (!bgPosAnim)
 				error("Couldn't find bg position anim %s", bgAnimName.c_str());
 			bgPosAnim->_callbackObj = bgchild;




More information about the Scummvm-git-logs mailing list