[FIX] Script to make a tarball now defaults to HEAD for the revision

[FIX] Enumeration types used to help remove some checks
[FIX] Macro code moved to static members of Object (not all though)
[FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper
[FIX] Scripting methods are now Q_SCRIPTABLE and not slots

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@239 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 12 insertions, 17 deletions

diff --git a/pokescripting/MapWrapper.h b/pokescripting/MapWrapper.h
index 573dce4d..71b55270 100644
--- a/pokescripting/MapWrapper.h
+++ b/pokescripting/MapWrapper.h
@@ -38,30 +38,25 @@ class POKESCRIPTING_EXPORT MapWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static MapWrapper* create(const Pokemod::Map* map, QObject* parent)
-        {
-            if (!m_instances.contains(map->id()))
-                m_instances[map->id()] = new MapWrapper(map, parent);
-            return qobject_cast<MapWrapper*>(m_instances[map->id()]);
-        }
+        static MapWrapper* create(const Pokemod::Map* map, PokemodWrapper* parent);
         
         MapEffectWrapper* effect(const int id);
         MapTrainerWrapper* trainer(const int id);
         MapWarpWrapper* warp(const int id);
         MapWildListWrapper* wildList(const int id);
-    public slots:
-        QString name() const;
-        MapWarpWrapper* flyWarp();
-        int type() const;
-        TileWrapper* tile(const int row, const int column);
-        QPoint mapSize() const;
         
-        MapEffectWrapper* effect(const QString& name);
-        MapTrainerWrapper* trainer(const QString& name);
-        MapWarpWrapper* warp(const QString& name);
-        MapWildListWrapper* wildList(const QString& name);
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE MapWarpWrapper* flyWarp();
+        Q_SCRIPTABLE Pokemod::Map::Type type() const;
+        Q_SCRIPTABLE TileWrapper* tile(const int row, const int column);
+        Q_SCRIPTABLE QPoint mapSize() const;
+        
+        Q_SCRIPTABLE MapEffectWrapper* effect(const QString& name);
+        Q_SCRIPTABLE MapTrainerWrapper* trainer(const QString& name);
+        Q_SCRIPTABLE MapWarpWrapper* warp(const QString& name);
+        Q_SCRIPTABLE MapWildListWrapper* wildList(const QString& name);
     private:
-        MapWrapper(const Pokemod::Map* map, QObject* parent);
+        MapWrapper(const Pokemod::Map* map, PokemodWrapper* parent);
         MapWrapper& operator=(const MapWrapper& rhs);
         
         const Pokemod::Map* m_map;