aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/myst.h
diff options
context:
space:
mode:
authorDavid Turner2010-11-09 11:02:06 +0000
committerDavid Turner2010-11-09 11:02:06 +0000
commit63d023964e1523d88463602a7b556e2c8fbe0799 (patch)
tree4b0c290fa42c6d25737b8b4c79e106cba737d551 /engines/mohawk/myst.h
parent77a636aaec30f1e1e9f69038dbd397e9bb23dedf (diff)
downloadscummvm-rg350-63d023964e1523d88463602a7b556e2c8fbe0799.tar.gz
scummvm-rg350-63d023964e1523d88463602a7b556e2c8fbe0799.tar.bz2
scummvm-rg350-63d023964e1523d88463602a7b556e2c8fbe0799.zip
MOHAWK: Close a number of memory leaks in Myst.
These corrections close a number of leaks reported by running Valgrind with --leak-check=full option, but some still remain, mainly in the image loading and caching. svn-id: r54152
Diffstat (limited to 'engines/mohawk/myst.h')
-rw-r--r--engines/mohawk/myst.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h
index 7486e559bb..a66456e1c8 100644
--- a/engines/mohawk/myst.h
+++ b/engines/mohawk/myst.h
@@ -157,7 +157,7 @@ struct MystScriptEntry {
class MystResource {
public:
MystResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
- virtual ~MystResource() {}
+ virtual ~MystResource();
MystResource *_parent;
@@ -188,6 +188,7 @@ protected:
class MystResourceType5 : public MystResource {
public:
MystResourceType5(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
+ virtual ~MystResourceType5();
void handleMouseUp();
protected:
@@ -218,7 +219,7 @@ private:
struct MystResourceType7 : public MystResource {
public:
MystResourceType7(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
- virtual ~MystResourceType7() {}
+ virtual ~MystResourceType7();
virtual void drawDataToScreen();
virtual void handleAnimation();
@@ -237,6 +238,7 @@ protected:
class MystResourceType8 : public MystResourceType7 {
public:
MystResourceType8(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
+ virtual ~MystResourceType8();
void drawDataToScreen();
uint16 getType8Var();
@@ -254,6 +256,7 @@ protected:
class MystResourceType10 : public MystResourceType8 {
public:
MystResourceType10(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
+ virtual ~MystResourceType10();
void handleMouseUp();
protected:
@@ -273,6 +276,7 @@ protected:
class MystResourceType11 : public MystResourceType8 {
public:
MystResourceType11(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
+ virtual ~MystResourceType11();
void handleMouseUp();
protected:
@@ -292,6 +296,7 @@ protected:
class MystResourceType12 : public MystResourceType8 {
public:
MystResourceType12(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
+ virtual ~MystResourceType12();
void handleAnimation();
void handleMouseUp();