aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-04-21 09:38:46 +0300
committerEugene Sandulenko2014-04-21 09:38:46 +0300
commit3091d0ae7f9ea1a8fc1d1be9bc773c853787fa26 (patch)
tree685774451a41aca4e0ebefc78642c2e919b99bf4
parent81a2ee7d7c38e427a00ac1102b817e2854bb45eb (diff)
downloadscummvm-rg350-3091d0ae7f9ea1a8fc1d1be9bc773c853787fa26.tar.gz
scummvm-rg350-3091d0ae7f9ea1a8fc1d1be9bc773c853787fa26.tar.bz2
scummvm-rg350-3091d0ae7f9ea1a8fc1d1be9bc773c853787fa26.zip
FULLPIPE: Implement couple destructors
-rw-r--r--engines/fullpipe/gfx.cpp4
-rw-r--r--engines/fullpipe/interaction.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 26ac4ab824..7c66a9a747 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -168,7 +168,9 @@ PictureObject::PictureObject() {
}
PictureObject::~PictureObject() {
- warning("STUB: PictureObject::~PictureObject()");
+ delete _picture;
+ _pictureObject2List->clear();
+ delete _pictureObject2List;
}
PictureObject::PictureObject(PictureObject *src) : GameObject(src) {
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 6b6ceb6eeb..f24f21584d 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -56,7 +56,9 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
}
InteractionController::~InteractionController() {
- warning("STUB: InteractionController::~InteractionController()");
+ _interactions.clear();
+
+ removeMessageHandler(124, -1);
}
bool InteractionController::load(MfcArchive &file) {