1 files changed, 11 insertions, 13 deletions
diff --git a/pokescripting/MapWarpWrapper.h b/pokescripting/MapWarpWrapper.h
index aefbd18b..02988a39 100644
--- a/pokescripting/MapWarpWrapper.h
+++ b/pokescripting/MapWarpWrapper.h
@@ -26,25 +26,23 @@
 
 namespace Pokescripting
 {
+// Forward declartions
+class MapWrapper;
+
 class POKESCRIPTING_EXPORT MapWarpWrapper : public ObjectWrapper
 {
     Q_OBJECT
     
     public:
-        static MapWarpWrapper* create(const Pokemod::MapWarp* warp, QObject* parent)
-        {
-            if (!m_instances.contains(warp->id()))
-                m_instances[warp->id()] = new MapWarpWrapper(warp, parent);
-            return qobject_cast<MapWarpWrapper*>(m_instances[warp->id()]);
-        }
-    public slots:
-        QString name() const;
-        QPoint coordinate() const;
-        int type() const;
-        MapWarpWrapper* toWarp();
-        Pokemod::Script script() const;
+        static MapWarpWrapper* create(const Pokemod::MapWarp* warp, MapWrapper* parent);
+        
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE QPoint coordinate() const;
+        Q_SCRIPTABLE Pokemod::MapWarp::Type type() const;
+        Q_SCRIPTABLE MapWarpWrapper* toWarp();
+        Q_SCRIPTABLE Pokemod::Script script() const;
     private:
-        MapWarpWrapper(const Pokemod::MapWarp* warp, QObject* parent);
+        MapWarpWrapper(const Pokemod::MapWarp* warp, MapWrapper* parent);
         MapWarpWrapper& operator=(const MapWarpWrapper& rhs);
         
         const Pokemod::MapWarp* m_warp;