FULLPIPE: Started fixing ObjstateCommand object inheritance

2 files changed, 16 insertions, 3 deletions

diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 34308976b9..9af4c59116 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -234,12 +234,16 @@ ObjstateCommand::ObjstateCommand() {
 	_objCommandName = 0;
 }
 
+ObjstateCommand::~ObjstateCommand() {
+	free(_objCommandName);
+}
+
 bool ObjstateCommand::load(MfcArchive &file) {
 	debug(5, "ObjStateCommand::load()");
 
 	_objtype = kObjTypeObjstateCommand;
 
-	_cmd.load(file);
+	ExCommand::load(file);
 
 	_value = file.readUint32LE();
 
@@ -248,6 +252,12 @@ bool ObjstateCommand::load(MfcArchive &file) {
 	return true;
 }
 
+ObjstateCommand *ObjstateCommand::createClone() {
+	warning("STUB: ObjstateCommand::createClone()");
+
+	return this;
+}
+
 MessageQueue::MessageQueue() {
 	_field_14 = 0;
 	_parId = 0;
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index 7f708383e3..75345137b4 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -92,15 +92,18 @@ class ExCommand2 : public ExCommand {
 	virtual ExCommand2 *createClone();
 };
 
-class ObjstateCommand : public CObject {
+class ObjstateCommand : public ExCommand {
  public:
-	ExCommand _cmd;
 	char *_objCommandName;
 	int _value;
 
  public:
 	ObjstateCommand();
+	virtual ~ObjstateCommand();
+
 	virtual bool load(MfcArchive &file);
+
+	virtual ObjstateCommand *createClone();
 };
 
 class MessageQueue : public CObject {