diff options
| author | Eugene Sandulenko | 2014-06-01 11:24:14 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-06-01 16:49:41 +0300 |
| commit | 913947c2477264860339596128eae5b2a11c20e8 (patch) | |
| tree | b8deb4de76a3743bad4e898275a1435670b1951b /engines/fullpipe | |
| parent | 7ab00631dd09fc9822b41b81fb53e06aeac0d5e4 (diff) | |
| download | scummvm-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')
| -rw-r--r-- | engines/fullpipe/motion.cpp | 8 | ||||
| -rw-r--r-- | engines/fullpipe/motion.h | 2 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 16 |
3 files changed, 13 insertions, 13 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) { diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h index 2b40791340..b7e96f61be 100644 --- a/engines/fullpipe/motion.h +++ b/engines/fullpipe/motion.h @@ -210,7 +210,7 @@ public: int _height; int _ladder_field_20; int _ladder_field_24; - Common::List<MctlLadderMovement *> _movements; + Common::List<MctlLadderMovement *> _ladmovements; MGM _mgm; public: diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index b47553ef6f..0a69335bea 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -324,15 +324,15 @@ void sceneHandler04_walkClimbLadder(ExCommand *ex) { g_vars->scene04_ladder->addObject(g_fp->_aniMan); if (g_vars->scene04_soundPlaying) { - g_vars->scene04_ladder->_movements.front()->movVars->varUpStart = MV_MAN_STARTLADDER2; - g_vars->scene04_ladder->_movements.front()->movVars->varUpGo = MV_MAN_GOLADDER2; - g_vars->scene04_ladder->_movements.front()->movVars->varUpStop = MV_MAN_STOPLADDER2; - g_vars->scene04_ladder->_movements.front()->staticIds[2] = ST_MAN_GOLADDER2; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpStart = MV_MAN_STARTLADDER2; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpGo = MV_MAN_GOLADDER2; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpStop = MV_MAN_STOPLADDER2; + g_vars->scene04_ladder->_ladmovements.front()->staticIds[2] = ST_MAN_GOLADDER2; } else { - g_vars->scene04_ladder->_movements.front()->movVars->varUpStart = MV_MAN_STARTLADDER; - g_vars->scene04_ladder->_movements.front()->movVars->varUpGo = MV_MAN_GOLADDER; - g_vars->scene04_ladder->_movements.front()->movVars->varUpStop = MV_MAN_STOPLADDER; - g_vars->scene04_ladder->_movements.front()->staticIds[2] = ST_MAN_GOLADDER; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpStart = MV_MAN_STARTLADDER; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpGo = MV_MAN_GOLADDER; + g_vars->scene04_ladder->_ladmovements.front()->movVars->varUpStop = MV_MAN_STOPLADDER; + g_vars->scene04_ladder->_ladmovements.front()->staticIds[2] = ST_MAN_GOLADDER; } g_fp->_aniMan->_priority = 12; |