From 3091d0ae7f9ea1a8fc1d1be9bc773c853787fa26 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 21 Apr 2014 09:38:46 +0300 Subject: FULLPIPE: Implement couple destructors --- engines/fullpipe/gfx.cpp | 4 +++- engines/fullpipe/interaction.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'engines/fullpipe') 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) { -- cgit v1.2.3