[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, 8 insertions, 13 deletions

diff --git a/pokescripting/AbilityWrapper.h b/pokescripting/AbilityWrapper.h
index 172a8660..88279ab7 100644
--- a/pokescripting/AbilityWrapper.h
+++ b/pokescripting/AbilityWrapper.h
@@ -31,20 +31,15 @@ class POKESCRIPTING_EXPORT AbilityWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static AbilityWrapper* create(const Pokemod::Ability* ability, QObject* parent)
-        {
-            if (!m_instances.contains(ability->id()))
-                m_instances[ability->id()] = new AbilityWrapper(ability, parent);
-            return qobject_cast<AbilityWrapper*>(m_instances[ability->id()]);
-        }
-    public slots:
-        QString name() const;
-        int priority() const;
-        QString description() const;
-        Pokemod::Script battleScript() const;
-        Pokemod::Script worldScript() const;
+        static AbilityWrapper* create(const Pokemod::Ability* ability, PokemodWrapper* parent);
+        
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE int priority() const;
+        Q_SCRIPTABLE QString description() const;
+        Q_SCRIPTABLE Pokemod::Script battleScript() const;
+        Q_SCRIPTABLE Pokemod::Script worldScript() const;
     private:
-        AbilityWrapper(const Pokemod::Ability* ability, QObject* parent);
+        AbilityWrapper(const Pokemod::Ability* ability, PokemodWrapper* parent);
         AbilityWrapper& operator=(const AbilityWrapper& rhs);
         
         const Pokemod::Ability* m_ability;