[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, 11 insertions, 15 deletions

diff --git a/pokescripting/MapTrainerWrapper.h b/pokescripting/MapTrainerWrapper.h
index 8a3e061d..9d74709e 100644
--- a/pokescripting/MapTrainerWrapper.h
+++ b/pokescripting/MapTrainerWrapper.h
@@ -27,6 +27,7 @@
 namespace Pokescripting
 {
 // Forward declarations
+class MapWrapper;
 class MapTrainerTeamMemberWrapper;
 class TrainerWrapper;
 
@@ -35,23 +36,18 @@ class POKESCRIPTING_EXPORT MapTrainerWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static MapTrainerWrapper* create(const Pokemod::MapTrainer* trainer, QObject* parent)
-        {
-            if (!m_instances.contains(trainer->id()))
-                m_instances[trainer->id()] = new MapTrainerWrapper(trainer, parent);
-            return qobject_cast<MapTrainerWrapper*>(m_instances[trainer->id()]);
-        }
-    public slots:
-        QString name() const;
-        TrainerWrapper* trainerClass();
-        int numberFight() const;
-        MapTrainerTeamMemberWrapper* leadTeamMember();
-        Pokemod::Script script() const;
+        static MapTrainerWrapper* create(const Pokemod::MapTrainer* trainer, MapWrapper* parent);
         
-        MapTrainerTeamMemberWrapper* teamMember(const int index);
-        int teamMemberCount() const;
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE TrainerWrapper* trainerClass();
+        Q_SCRIPTABLE int numberFight() const;
+        Q_SCRIPTABLE MapTrainerTeamMemberWrapper* leadTeamMember();
+        Q_SCRIPTABLE Pokemod::Script script() const;
+        
+        Q_SCRIPTABLE MapTrainerTeamMemberWrapper* teamMember(const int index);
+        Q_SCRIPTABLE int teamMemberCount() const;
     private:
-        MapTrainerWrapper(const Pokemod::MapTrainer* trainer, QObject* parent);
+        MapTrainerWrapper(const Pokemod::MapTrainer* trainer, MapWrapper* parent);
         MapTrainerWrapper& operator=(const MapTrainerWrapper& rhs);
         
         const Pokemod::MapTrainer* m_trainer;