diff options
| author | Eugene Sandulenko | 2013-12-14 14:53:15 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-12-14 15:15:10 +0200 |
| commit | 625ce270da5aaaa6f1ff34f2e4b1779c48766117 (patch) | |
| tree | edaf5a42b005f4815f83c9b958869a8e94a495e4 | |
| parent | 2c5b5cbb92455bb37d3061facf5178531c7b9142 (diff) | |
| download | scummvm-rg350-625ce270da5aaaa6f1ff34f2e4b1779c48766117.tar.gz scummvm-rg350-625ce270da5aaaa6f1ff34f2e4b1779c48766117.tar.bz2 scummvm-rg350-625ce270da5aaaa6f1ff34f2e4b1779c48766117.zip | |
FULLPIPE: Some renames in MctlLadder
| -rw-r--r-- | engines/fullpipe/motion.cpp | 6 | ||||
| -rw-r--r-- | engines/fullpipe/motion.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 3451259893..9bacfec0e2 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -186,8 +186,8 @@ MessageQueue *MctlCompound::doWalkTo(StaticANIObject *subj, int xpos, int ypos, } MctlLadder::MctlLadder() { - _ladder_field_18 = 0; - _objId = 0; + _width = 0; + _ladderX = 0; _height = 0; _ladderY = 0; _ladder_field_14 = 0; @@ -310,7 +310,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *subj, int xpos, int ypos, in } MessageQueue *MctlLadder::controllerWalkTo(StaticANIObject *ani, int off) { - return doWalkTo(ani, _objId + off * _ladder_field_18, _ladderY + off * _height, 1, 0); + return doWalkTo(ani, _ladderX + off * _width, _ladderY + off * _height, 1, 0); } MctlConnectionPoint *MctlCompound::findClosestConnectionPoint(int ox, int oy, int destIndex, int connectionX, int connectionY, int sourceIndex, int *minDistancePtr) { diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h index b1e4b69676..7d35c3f8c1 100644 --- a/engines/fullpipe/motion.h +++ b/engines/fullpipe/motion.h @@ -181,10 +181,10 @@ struct MctlLadderMovement { class MctlLadder : public MotionController { public: - int _objId; + int _ladderX; int _ladderY; int _ladder_field_14; - int _ladder_field_18; + int _width; int _height; int _ladder_field_20; int _ladder_field_24; diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index 8c4dba0d09..cd0b40fee2 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -313,10 +313,10 @@ void sceneHandler04_walkClimbLadder(ExCommand *ex) { g_vars->scene04_dudeOnLadder = 1; g_vars->scene04_ladder = new MctlLadder; - g_vars->scene04_ladder->_objId = MV_MAN_TURN_SUD; + g_vars->scene04_ladder->_ladderX = 1089; g_vars->scene04_ladder->_ladderY = 406; g_vars->scene04_ladder->_ladder_field_14 = 12; - g_vars->scene04_ladder->_ladder_field_18 = 0; + g_vars->scene04_ladder->_width = 0; g_vars->scene04_ladder->_height = -40; g_vars->scene04_ladder->_ladder_field_20 = 0; g_vars->scene04_ladder->_ladder_field_24 = -60; |