diff options
| author | Eugene Sandulenko | 2013-12-06 22:47:30 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-12-06 22:47:30 +0200 |
| commit | 4a27d727a7a32f5407cb1a89016d533df9841d01 (patch) | |
| tree | d620885bd36bf2ac1b613e48d665b87e37f5cfd7 /engines/fullpipe | |
| parent | d9c8cb71180efe12c4ee67eec03d84e4a0863f30 (diff) | |
| download | scummvm-rg350-4a27d727a7a32f5407cb1a89016d533df9841d01.tar.gz scummvm-rg350-4a27d727a7a32f5407cb1a89016d533df9841d01.tar.bz2 scummvm-rg350-4a27d727a7a32f5407cb1a89016d533df9841d01.zip | |
FULLPIPE: Proper structure of MctlLadder class variables
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/motion.cpp | 7 | ||||
| -rw-r--r-- | engines/fullpipe/motion.h | 20 |
2 files changed, 19 insertions, 8 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 28201c535d..844813807e 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -186,13 +186,8 @@ MessageQueue *MctlCompound::doWalkTo(StaticANIObject *subj, int xpos, int ypos, } MctlLadder::MctlLadder() { - _preload.preloadId1 = 0; - _preload.keyCode = 0; - _preload.sceneId = 0; - _preload.preloadId2 = 0; - _ladder_field_18 = 0; - _ladder_field_C = 0; + _objId = 0; _ladder_field_1C = 0; _ladder_field_10 = 0; _ladder_field_14 = 0; diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h index 9e1e42aaa4..6cc3862ca8 100644 --- a/engines/fullpipe/motion.h +++ b/engines/fullpipe/motion.h @@ -161,16 +161,32 @@ public: MessageQueue *genMovement(MGMInfo *mgminfo); }; +struct MctlLadderMovementVars { + int varUpGo; + int varDownGo; + int varUpStop; + int varDownStop; + int varUpStart; + int varDownStart; +}; + +struct MctlLadderMovement { + int objId; + int staticIdsSize; + MctlLadderMovementVars *movVars; + int *staticIds; +}; + class MctlLadder : public MotionController { public: - int _ladder_field_C; + int _objId; int _ladder_field_10; int _ladder_field_14; int _ladder_field_18; int _ladder_field_1C; int _ladder_field_20; int _ladder_field_24; - PreloadItem _preload; + Common::List<MctlLadderMovement *> _movements; MGM _mgm; public: |