[Scummvm-cvs-logs] scummvm master -> 9aaa7d742fa2d33e8f87d12828dd1d0248e19854

sev- sev at scummvm.org
Sun Dec 15 01:47:23 CET 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:
9aaa7d742f FULLPIPE: Implemented several destructors


Commit: 9aaa7d742fa2d33e8f87d12828dd1d0248e19854
    https://github.com/scummvm/scummvm/commit/9aaa7d742fa2d33e8f87d12828dd1d0248e19854
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-14T16:46:53-08:00

Commit Message:
FULLPIPE: Implemented several destructors

Changed paths:
    engines/fullpipe/motion.cpp
    engines/fullpipe/motion.h



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 9bacfec..0aa6a4a 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -185,6 +185,11 @@ MessageQueue *MctlCompound::doWalkTo(StaticANIObject *subj, int xpos, int ypos,
 	return mq;
 }
 
+MctlCompoundArrayItem::~MctlCompoundArrayItem() {
+	delete _movGraphReactObj;
+	delete _motionControllerObj;
+}
+
 MctlLadder::MctlLadder() {
 	_width = 0;
 	_ladderX = 0;
@@ -319,6 +324,21 @@ MctlConnectionPoint *MctlCompound::findClosestConnectionPoint(int ox, int oy, in
 	return 0;
 }
 
+MctlConnectionPoint::MctlConnectionPoint() {
+	_connectionX = 0;
+	_connectionY = 0;
+	_field_C = 0;
+	_field_10 = 0;
+	_field_14 = 0;
+	_field_16 = 0;
+	_messageQueueObj = 0;
+	_motionControllerObj = 0;
+}
+
+MctlConnectionPoint::~MctlConnectionPoint() {
+	delete _messageQueueObj;
+}
+
 bool MctlCompoundArray::load(MfcArchive &file) {
 	debug(5, "MctlCompoundArray::load()");
 
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 7d35c3f..c54ba71 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -86,6 +86,7 @@ public:
 
 public:
 	MctlCompoundArrayItem() : _movGraphReactObj(0), _motionControllerObj(0), _field_20(0), _field_24(0), _field_28(0) {}
+	~MctlCompoundArrayItem();
 };
 
 class MctlCompoundArray : public Common::Array<MctlCompoundArrayItem *>, public CObject {
@@ -413,6 +414,9 @@ public:
 	int16 _field_16;
 	MessageQueue *_messageQueueObj;
 	int _motionControllerObj;
+
+	MctlConnectionPoint();
+	~MctlConnectionPoint();
 };
 
 } // End of namespace Fullpipe






More information about the Scummvm-git-logs mailing list