aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-09-28 11:21:13 +0300
committerEugene Sandulenko2013-09-28 11:36:11 +0300
commitd207dcfba64cefc8c3423878c8f20ee7752a862c (patch)
treeb089af42425d0e64d0340de85253e6aac3673650 /engines
parent93c337524422cf93ea987abeb6fe44f088d9fe5b (diff)
downloadscummvm-rg350-d207dcfba64cefc8c3423878c8f20ee7752a862c.tar.gz
scummvm-rg350-d207dcfba64cefc8c3423878c8f20ee7752a862c.tar.bz2
scummvm-rg350-d207dcfba64cefc8c3423878c8f20ee7752a862c.zip
FULLPIPE: Bug fix MctlCompound::load()
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/motion.cpp4
-rw-r--r--engines/fullpipe/motion.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 5fd8d61263..5def3cb4a7 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -50,7 +50,9 @@ bool MctlCompound::load(MfcArchive &file) {
for (int i = 0; i < count; i++) {
debug(6, "CompoundArray[%d]", i);
- MctlCompoundArrayItem *obj = (MctlCompoundArrayItem *)file.readClass();
+ MctlCompoundArrayItem *obj = new MctlCompoundArrayItem();
+
+ obj->_motionControllerObj = (MotionController *)file.readClass();
int count1 = file.readUint32LE();
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 2db3db6676..3e76f24c60 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -61,10 +61,7 @@ class MovGraphReact : public CObject {
// Empty
};
-class MctlConnectionPointsArray : public Common::Array<CObject>, public CObject {
- public:
- virtual bool load(MfcArchive &file);
-};
+typedef Common::Array<CObject> MctlConnectionPointsArray;
class MctlCompoundArrayItem : public CObject {
friend class MctlCompound;