diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-18 18:51:31 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-18 18:51:31 +0000 |
| commit | c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 (patch) | |
| tree | b7ff53cf9747ad61a80b169e1adad96950f4b16c /pokescripting/TrainerWrapper.cpp | |
| parent | fa4764c9e4d86fdfa976bb9fa9f6976e82c496d5 (diff) | |
| download | sigen-c1793a87ebea8c8e1bb2d5d1a409d105bfae3871.tar.gz sigen-c1793a87ebea8c8e1bb2d5d1a409d105bfae3871.tar.xz sigen-c1793a87ebea8c8e1bb2d5d1a409d105bfae3871.zip | |
[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
Diffstat (limited to 'pokescripting/TrainerWrapper.cpp')
| -rw-r--r-- | pokescripting/TrainerWrapper.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pokescripting/TrainerWrapper.cpp b/pokescripting/TrainerWrapper.cpp index 0c30ceb0..7f19bfb1 100644 --- a/pokescripting/TrainerWrapper.cpp +++ b/pokescripting/TrainerWrapper.cpp @@ -19,9 +19,16 @@ #include "TrainerWrapper.h" // Pokescripting includes -#include "SkinWrapper.h" +#include "PokemodWrapper.h" -Pokescripting::TrainerWrapper::TrainerWrapper(const Pokemod::Trainer* trainer, QObject* parent) : +Pokescripting::TrainerWrapper* Pokescripting::TrainerWrapper::create(const Pokemod::Trainer* trainer, PokemodWrapper* parent) +{ + if (!m_instances.contains(Signiture(parent, trainer->id()))) + m_instances[Signiture(parent, trainer->id())] = new TrainerWrapper(trainer, parent); + return qobject_cast<TrainerWrapper*>(m_instances[Signiture(parent, trainer->id())]); +} + +Pokescripting::TrainerWrapper::TrainerWrapper(const Pokemod::Trainer* trainer, PokemodWrapper* parent) : ObjectWrapper(trainer, parent), m_trainer(trainer) { @@ -41,7 +48,7 @@ int Pokescripting::TrainerWrapper::TrainerWrapper::moneyFactor() const Pokescripting::SkinWrapper* Pokescripting::TrainerWrapper::TrainerWrapper::skin() { - return SkinWrapper::create(pokemod()->skinById(m_trainer->skin()), this); + return pokemod()->skin(m_trainer->skin()); } int Pokescripting::TrainerWrapper::TrainerWrapper::depth() const @@ -51,27 +58,27 @@ int Pokescripting::TrainerWrapper::TrainerWrapper::depth() const return m_trainer->depth(); } -int Pokescripting::TrainerWrapper::TrainerWrapper::teamIntel() const +Pokemod::Trainer::Intelligence Pokescripting::TrainerWrapper::TrainerWrapper::teamIntel() const { return m_trainer->teamIntel(); } -int Pokescripting::TrainerWrapper::TrainerWrapper::moveIntel() const +Pokemod::Trainer::Intelligence Pokescripting::TrainerWrapper::TrainerWrapper::moveIntel() const { return m_trainer->moveIntel(); } -int Pokescripting::TrainerWrapper::TrainerWrapper::itemIntel() const +Pokemod::Trainer::Intelligence Pokescripting::TrainerWrapper::TrainerWrapper::itemIntel() const { return m_trainer->itemIntel(); } -int Pokescripting::TrainerWrapper::TrainerWrapper::abilityIntel() const +Pokemod::Trainer::Intelligence Pokescripting::TrainerWrapper::TrainerWrapper::abilityIntel() const { return m_trainer->abilityIntel(); } -int Pokescripting::TrainerWrapper::TrainerWrapper::statIntel() const +Pokemod::Trainer::Intelligence Pokescripting::TrainerWrapper::TrainerWrapper::statIntel() const { return m_trainer->statIntel(); } |