From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [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 --- pokescripting/NatureWrapper.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'pokescripting/NatureWrapper.cpp') diff --git a/pokescripting/NatureWrapper.cpp b/pokescripting/NatureWrapper.cpp index d4fc7efd..fa9f1c06 100644 --- a/pokescripting/NatureWrapper.cpp +++ b/pokescripting/NatureWrapper.cpp @@ -18,7 +18,17 @@ // Header include #include "NatureWrapper.h" -Pokescripting::NatureWrapper::NatureWrapper(const Pokemod::Nature* nature, QObject* parent) : +// Pokescripting includes +#include "PokemodWrapper.h" + +Pokescripting::NatureWrapper* Pokescripting::NatureWrapper::create(const Pokemod::Nature* nature, PokemodWrapper* parent) +{ + if (!m_instances.contains(Signiture(parent, nature->id()))) + m_instances[Signiture(parent, nature->id())] = new NatureWrapper(nature, parent); + return qobject_cast(m_instances[Signiture(parent, nature->id())]); +} + +Pokescripting::NatureWrapper::NatureWrapper(const Pokemod::Nature* nature, PokemodWrapper* parent) : ObjectWrapper(nature, parent), m_nature(nature) { @@ -29,7 +39,7 @@ QString Pokescripting::NatureWrapper::name() const return m_nature->name(); } -Pokemod::Fraction Pokescripting::NatureWrapper::stat(const int stat) const +Pokemod::Fraction Pokescripting::NatureWrapper::stat(const Pokemod::Stat stat) const { return m_nature->stat(stat); } -- cgit