aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-10-02 09:03:08 +0300
committerEugene Sandulenko2013-10-02 20:59:57 +0300
commitd179d0fb9d26e8fe31b340e2af420eb7cbf72be8 (patch)
treef6a3dee57b0e339ac6d28744ca6a78594f34c3e6 /engines
parent98a30990760c9135b72adab643ddbd4d06aa233d (diff)
downloadscummvm-rg350-d179d0fb9d26e8fe31b340e2af420eb7cbf72be8.tar.gz
scummvm-rg350-d179d0fb9d26e8fe31b340e2af420eb7cbf72be8.tar.bz2
scummvm-rg350-d179d0fb9d26e8fe31b340e2af420eb7cbf72be8.zip
FULLPIPE: Implement MGM::clear()
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/motion.cpp8
-rw-r--r--engines/fullpipe/motion.h13
2 files changed, 8 insertions, 13 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index ad24514b26..6a39b9f7b5 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -479,17 +479,11 @@ MovGraphNode *MovGraph::calcOffset(int ox, int oy) {
}
void MGM::clear() {
- warning("STUB: MGM:clear()");
+ _items.clear();
}
MGMItem::MGMItem() {
objId = 0;
- subItems = 0;
- staticsListCount = 0;
- movementListCount = 0;
- statics = 0;
- movements1 = 0;
- movements2 = 0;
}
void MGM::addItem(int objId) {
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 09485507d7..bf0b1bedd4 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -25,6 +25,9 @@
namespace Fullpipe {
+class Statics;
+class Movement;
+
int startWalkTo(int objId, int objKey, int x, int y, int a5);
int doSomeAnimation(int objId, int objKey, int a3);
int doSomeAnimation2(int objId, int objKey);
@@ -102,12 +105,10 @@ class MctlCompound : public MotionController {
struct MGMItem {
int16 objId;
- int subItems;
- int staticsListCount;
- int movementListCount;
- int statics;
- int movements1;
- int movements2;
+ Common::Array<int> subItems;
+ Common::Array<Statics *> statics;
+ Common::Array<Movement *> movements1;
+ Common::Array<Movement *> movements2;
MGMItem();
};