[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, 3 deletions

diff --git a/pokescripting/SpeciesAbilityWrapper.cpp b/pokescripting/SpeciesAbilityWrapper.cpp
index a3ae9ef4..fb392653 100644
--- a/pokescripting/SpeciesAbilityWrapper.cpp
+++ b/pokescripting/SpeciesAbilityWrapper.cpp
@@ -19,9 +19,17 @@
 #include "SpeciesAbilityWrapper.h"
 
 // Pokescripting includes
-#include "AbilityWrapper.h"
+#include "PokemodWrapper.h"
+#include "SpeciesWrapper.h"
 
-Pokescripting::SpeciesAbilityWrapper::SpeciesAbilityWrapper(const Pokemod::SpeciesAbility* ability, QObject* parent) :
+Pokescripting::SpeciesAbilityWrapper* Pokescripting::SpeciesAbilityWrapper::create(const Pokemod::SpeciesAbility* ability, SpeciesWrapper* parent)
+{
+    if (!m_instances.contains(Signiture(parent, ability->id())))
+        m_instances[Signiture(parent, ability->id())] = new SpeciesAbilityWrapper(ability, parent);
+    return qobject_cast<SpeciesAbilityWrapper*>(m_instances[Signiture(parent, ability->id())]);
+}
+
+Pokescripting::SpeciesAbilityWrapper::SpeciesAbilityWrapper(const Pokemod::SpeciesAbility* ability, SpeciesWrapper* parent) :
         ObjectWrapper(ability, parent),
         m_ability(ability)
 {
@@ -29,7 +37,7 @@ Pokescripting::SpeciesAbilityWrapper::SpeciesAbilityWrapper(const Pokemod::Speci
 
 Pokescripting::AbilityWrapper* Pokescripting::SpeciesAbilityWrapper::ability()
 {
-    return AbilityWrapper::create(pokemod()->abilityById(m_ability->ability()), this);
+    return pokemod()->ability(m_ability->ability());
 }
 
 int Pokescripting::SpeciesAbilityWrapper::weight() const