[Scummvm-cvs-logs] scummvm master -> d207dcfba64cefc8c3423878c8f20ee7752a862c
sev-
sev at scummvm.org
Sat Sep 28 10:49:18 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d207dcfba6 FULLPIPE: Bug fix MctlCompound::load()
Commit: d207dcfba64cefc8c3423878c8f20ee7752a862c
https://github.com/scummvm/scummvm/commit/d207dcfba64cefc8c3423878c8f20ee7752a862c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-28T01:36:11-07:00
Commit Message:
FULLPIPE: Bug fix MctlCompound::load()
Changed paths:
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 5fd8d61..5def3cb 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 2db3db6..3e76f24 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;
More information about the Scummvm-git-logs
mailing list