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

[sev-]

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:
ac6d6c99b5 FULLPIPE: Fix parent variable overwrite in MctlLadder::initMovement


Commit: ac6d6c99b5917730c566fe750e3a8334a6c10207
    https://github.com/scummvm/scummvm/commit/ac6d6c99b5917730c566fe750e3a8334a6c10207
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-29T20:32:05+02:00

Commit Message:
FULLPIPE: Fix parent variable overwrite in MctlLadder::initMovement

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index f0166da..74bb679 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -372,16 +372,16 @@ bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement
 	if (!v)
 		return false;
 
-	v = v->getSubVarByName("Test_Ladder");
+	GameVar *l = v->getSubVarByName("Test_Ladder");
 
-	if (!v)
+	if (!l)
 		return false;
 
 	movement->staticIdsSize = 6;
 	movement->movVars = new MctlLadderMovementVars;
 	movement->staticIds = new int[movement->staticIdsSize];
 
-	v = v->getSubVarByName("Up");
+	v = l->getSubVarByName("Up");
 
 	if (!v)
 		return false;
@@ -393,7 +393,7 @@ bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement
 	movement->staticIds[0] = ani->getMovementById(movement->movVars->varUpStart)->_staticsObj1->_staticsId;
 	movement->staticIds[2] = ani->getMovementById(movement->movVars->varUpGo)->_staticsObj1->_staticsId;
 
-	v = v->getSubVarByName("Down");
+	v = l->getSubVarByName("Down");
 
 	if (!v)
 		return false;