[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, 5 insertions, 10 deletions

diff --git a/pokescripting/SpriteWrapper.h b/pokescripting/SpriteWrapper.h
index 5a579d29..87b101d5 100644
--- a/pokescripting/SpriteWrapper.h
+++ b/pokescripting/SpriteWrapper.h
@@ -31,17 +31,12 @@ class POKESCRIPTING_EXPORT SpriteWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static SpriteWrapper* create(const Pokemod::Sprite* sprite, QObject* parent)
-        {
-            if (!m_instances.contains(sprite->id()))
-                m_instances[sprite->id()] = new SpriteWrapper(sprite, parent);
-            return qobject_cast<SpriteWrapper*>(m_instances[sprite->id()]);
-        }
-    public slots:
-        QString name() const;
-        QPixmap sprite() const;
+        static SpriteWrapper* create(const Pokemod::Sprite* sprite, PokemodWrapper* parent);
+        
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE QPixmap sprite() const;
     private:
-        SpriteWrapper(const Pokemod::Sprite* sprite, QObject* parent);
+        SpriteWrapper(const Pokemod::Sprite* sprite, PokemodWrapper* parent);
         SpriteWrapper& operator=(const SpriteWrapper& rhs);
         
         const Pokemod::Sprite* m_sprite;