1 files changed, 9 insertions, 8 deletions
diff --git a/pokemod/Map.h b/pokemod/Map.h
index 70697799..2acc5b84 100644
--- a/pokemod/Map.h
+++ b/pokemod/Map.h
@@ -31,11 +31,11 @@
 #include <Matrix.h>
 
 #include "Object.h"
-#include "MapEffect.h"
-#include "MapTrainer.h"
-#include "MapWarp.h"
-#include "MapWildList.h"
 
+class MapEffect;
+class MapTrainer;
+class MapWarp;
+class MapWildList;
 class Pokemod;
 
 class Map : public Object
@@ -53,6 +53,7 @@ class Map : public Object
         Map(const Pokemod* par, const int _id);
         Map(const Pokemod* par, const Map& m, const int _id);
         Map(const Pokemod* par, const QString& fname, const int _id = -1);
+        ~Map();
         
         void load(const QString& fname, const int _id = -1) throw(Exception);
         void save() const throw(Exception);
@@ -136,10 +137,10 @@ class Map : public Object
         int type;
         Matrix<int> tiles;
         
-        QList<MapEffect> effects;
-        QList<MapTrainer> trainers;
-        QList<MapWarp> warps;
-        QList<MapWildList> wildLists;
+        QList<MapEffect*> effects;
+        QList<MapTrainer*> trainers;
+        QList<MapWarp*> warps;
+        QList<MapWildList*> wildLists;
 };
 
 #endif