aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/motion.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2014-06-01 11:24:14 +0300
committerEugene Sandulenko2014-06-01 16:49:41 +0300
commit913947c2477264860339596128eae5b2a11c20e8 (patch)
treeb8deb4de76a3743bad4e898275a1435670b1951b /engines/fullpipe/motion.cpp
parent7ab00631dd09fc9822b41b81fb53e06aeac0d5e4 (diff)
downloadscummvm-rg350-913947c2477264860339596128eae5b2a11c20e8.tar.gz
scummvm-rg350-913947c2477264860339596128eae5b2a11c20e8.tar.bz2
scummvm-rg350-913947c2477264860339596128eae5b2a11c20e8.zip
FULLPIPE: Rename class variable to avoid confusion
Diffstat (limited to 'engines/fullpipe/motion.cpp')
-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 bea9bcdc10..b96d2d8bef 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -337,7 +337,7 @@ void MctlLadder::addObject(StaticANIObject *obj) {
if (initMovement(obj, movement)) {
_mgm.addItem(obj->_id);
- _movements.push_back(movement);
+ _ladmovements.push_back(movement);
} else {
delete movement;
}
@@ -347,7 +347,7 @@ void MctlLadder::addObject(StaticANIObject *obj) {
int MctlLadder::findObjectPos(StaticANIObject *obj) {
int res = -1;
- for (Common::List<MctlLadderMovement *>::iterator it = _movements.begin(); it != _movements.end(); ++it, ++res)
+ for (Common::List<MctlLadderMovement *>::iterator it = _ladmovements.begin(); it != _ladmovements.end(); ++it, ++res)
if ((*it)->objId == obj->_id)
break;
@@ -401,12 +401,12 @@ bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement
void MctlLadder::freeItems() {
_mgm.clear();
- for (Common::List<MctlLadderMovement *>::iterator it = _movements.begin(); it != _movements.end(); ++it) {
+ for (Common::List<MctlLadderMovement *>::iterator it = _ladmovements.begin(); it != _ladmovements.end(); ++it) {
delete (*it)->movVars;
delete [] (*it)->staticIds;
}
- _movements.clear();
+ _ladmovements.clear();
}
MessageQueue *MctlLadder::method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) {