FULLPIPE: Stubbed and implemented some class destructors

11 files changed, 56 insertions, 1 deletions

diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 64e6b93fb2..c7463fe658 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -79,6 +79,8 @@ GameLoader::~GameLoader() {
 	delete _gameProject;
 	delete _interactionController;
 	delete _inputController;
+
+	warning("STUB: GameLoader::~GameLoader()");
 }
 
 bool GameLoader::load(MfcArchive &file) {
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 435a06d63b..cbd9532118 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -87,6 +87,10 @@ Background::Background() {
 	_palette = 0;
 }
 
+Background::~Background() {
+	warning("STUB: Background::~Background()");
+}
+
 bool Background::load(MfcArchive &file) {
 	debug(5, "Background::load()");
 	_bgname = file.readPascalString();
@@ -269,6 +273,11 @@ bool PictureObject::isPixelHitAtPos(int x, int y) {
 	return res;
 }
 
+void PictureObject::setOXY2() {
+	_ox2 = _ox;
+	_oy2 = _oy;
+}
+
 GameObject::GameObject() {
 	_okeyCode = 0;
 	_flags = 0;
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 72495bfe0b..231ad99663 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -115,6 +115,8 @@ class Picture : public MemoryObject {
 class BigPicture : public Picture {
   public:
 	BigPicture() {}
+	virtual ~BigPicture() {}
+
 	virtual bool load(MfcArchive &file);
 	virtual void draw(int x, int y, int style, int angle);
 };
@@ -168,6 +170,7 @@ class PictureObject : public GameObject {
 	bool setPicAniInfo(PicAniInfo *picAniInfo);
 	bool isPointInside(int x, int y);
 	bool isPixelHitAtPos(int x, int y);
+	void setOXY2();
 };
 
 class Background : public CObject {
@@ -185,6 +188,8 @@ class Background : public CObject {
 
   public:
 	Background();
+	virtual ~Background();
+
 	virtual bool load(MfcArchive &file);
 	void addPictureObject(PictureObject *pct);
 
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 9d92638328..59b01a1777 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -55,6 +55,10 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
 	return false;
 }
 
+InteractionController::~InteractionController() {
+	warning("STUB: InteractionController::~InteractionController()");
+}
+
 bool InteractionController::load(MfcArchive &file) {
 	debug(5, "InteractionController::load()");
 
@@ -422,6 +426,10 @@ Interaction::Interaction() {
 	_actionName = 0;
 }
 
+Interaction::~Interaction() {
+	warning("STUB: Interaction::~Interaction()");
+}
+
 bool Interaction::load(MfcArchive &file) {
 	debug(5, "Interaction::load()");
 
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index 456b35458b..7d9ee0bd51 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -54,6 +54,8 @@ class Interaction : public CObject {
 
  public:
 	Interaction();
+	virtual ~Interaction();
+
 	virtual bool load(MfcArchive &file);
 	bool canInteract(GameObject *obj1, GameObject *obj2, int invId);
 	bool isOverlapping(StaticANIObject *subj, GameObject *obj);
@@ -70,6 +72,7 @@ class InteractionController : public CObject {
 
  public:
 	InteractionController() : _field_20(0), _flag24(true) {}
+	virtual ~InteractionController();
 
 	virtual bool load(MfcArchive &file);
 
diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp
index 3e22f8526d..f5af0611cb 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/fullpipe/inventory.cpp
@@ -30,6 +30,10 @@
 
 namespace Fullpipe {
 
+Inventory::~Inventory() {
+	warning("STUB: Inventory::~Inventory()");
+}
+
 bool Inventory::load(MfcArchive &file) {
 	debug(5, "Inventory::load()");
 
@@ -85,6 +89,10 @@ Inventory2::Inventory2() {
 	_topOffset = -65;
 }
 
+Inventory2::~Inventory2() {
+	warning("STUB: Inventory2::~Inventory2()");
+}
+
 bool Inventory2::loadPartial(MfcArchive &file) { // Inventory2_SerializePartially
 	int numInvs = file.readUint32LE();
 
diff --git a/engines/fullpipe/inventory.h b/engines/fullpipe/inventory.h
index 6d07f069bd..bc5847312b 100644
--- a/engines/fullpipe/inventory.h
+++ b/engines/fullpipe/inventory.h
@@ -49,6 +49,8 @@ class Inventory : public CObject {
 
  public:
 	Inventory() { _sceneId = 0; }
+	virtual ~Inventory();
+
 	virtual bool load(MfcArchive &file);
 
 	int getInventoryPoolItemIndexById(int itemId);
@@ -96,6 +98,8 @@ class Inventory2 : public Inventory {
 
  public:
 	Inventory2();
+	virtual ~Inventory2();
+
 	bool loadPartial(MfcArchive &file);
 	void addItem(int itemId, int count);
 	void addItem2(StaticANIObject *obj);
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index a12851e63b..d13559429a 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -82,6 +82,8 @@ class GameVar : public CObject {
 
  public:
 	GameVar();
+	virtual ~GameVar();
+
 	virtual bool load(MfcArchive &file);
 	GameVar *getSubVarByName(const char *name);
 	bool setSubVarAsInt(const char *name, int value);
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 928bd5cf2e..997d92ae1c 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -92,6 +92,9 @@ bool SceneTag::load(MfcArchive &file) {
 
 SceneTag::~SceneTag() {
 	free(_tag);
+
+	delete _scene;
+	delete _field_4;
 }
 
 void SceneTag::loadScene() {
@@ -129,6 +132,10 @@ Scene::Scene() {
 	_sceneName = 0;
 }
 
+Scene::~Scene() {
+	warning("STUB: Scene::~Scene()");
+}
+
 bool Scene::load(MfcArchive &file) {
 	debug(5, "Scene::load()");
 
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index b8defe2d06..fc04a877f5 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -44,6 +44,7 @@ class Scene : public Background {
 
   public:
 	Scene();
+	virtual ~Scene();
 
 	virtual bool load(MfcArchive &file);
 
@@ -84,7 +85,7 @@ class Scene : public Background {
 
 class SceneTag : public CObject {
  public:
-	int _field_4;
+	CObject *_field_4;
 	char *_tag;
 	Scene *_scene;
 	int16 _sceneId;
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 9c54947b35..6e2df2c593 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -146,6 +146,8 @@ bool GameProject::load(MfcArchive &file) {
 
 GameProject::~GameProject() {
 	free(_headerFilename);
+
+	delete _sceneTagList;
 }
 
 GameVar::GameVar() {
@@ -159,6 +161,10 @@ GameVar::GameVar() {
 	_varName = 0;
 }
 
+GameVar::~GameVar() {
+	warning("STUB: GameVar::~GameVar()");
+}
+
 bool GameVar::load(MfcArchive &file) {
 	_varName = file.readPascalString();
 	_varType = file.readUint32LE();