aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRetro-Junk2016-08-29 20:17:40 +0300
committerEugene Sandulenko2016-08-29 20:32:05 +0200
commitac6d6c99b5917730c566fe750e3a8334a6c10207 (patch)
tree2b09573cd15b5cfa7a83d263a976555fa7ef49ed /engines
parentf9f55d1af3f2570529d7c0b5159c034aa2507bc7 (diff)
downloadscummvm-rg350-ac6d6c99b5917730c566fe750e3a8334a6c10207.tar.gz
scummvm-rg350-ac6d6c99b5917730c566fe750e3a8334a6c10207.tar.bz2
scummvm-rg350-ac6d6c99b5917730c566fe750e3a8334a6c10207.zip
FULLPIPE: Fix parent variable overwrite in MctlLadder::initMovement
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/motion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index f0166daee0..74bb679a24 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;