diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 23:06:44 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 23:06:44 +0000 |
| commit | 56b91df6010a9f3d304438cf95816399a6e46622 (patch) | |
| tree | 4fc79267d86ebca445c91e00630cb29cfc5c1da4 /pokescripting/TrainerWrapper.h | |
| parent | c014db49f5044f15e7ad0236437ac9ae4aa3b23f (diff) | |
| download | sigen-56b91df6010a9f3d304438cf95816399a6e46622.tar.gz sigen-56b91df6010a9f3d304438cf95816399a6e46622.tar.xz sigen-56b91df6010a9f3d304438cf95816399a6e46622.zip | |
[FIX] SoundUI widget has a better layout
[FIX] Sound playback works in SoundUI
[FIX] SoundWrapper returns a Phonon object for playback in scripts now
[FIX] Wrapper classes now won't be duplicated (persistent storage is possible now)
[FIX] Linking to libraries is fixed for RPM
[FIX] Pokemod Macros.h is hidden if not compiling pokemod
[FIX] make-tarball script is simpler now (and works as upstream, not local copy)
[FIX] Cleaned up spec file per review request for Fedora
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@236 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokescripting/TrainerWrapper.h')
| -rw-r--r-- | pokescripting/TrainerWrapper.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pokescripting/TrainerWrapper.h b/pokescripting/TrainerWrapper.h index 963e153f..ba24d105 100644 --- a/pokescripting/TrainerWrapper.h +++ b/pokescripting/TrainerWrapper.h @@ -32,11 +32,16 @@ class POKESCRIPTING_EXPORT TrainerWrapper : public ObjectWrapper Q_OBJECT public: - TrainerWrapper(const Pokemod::Trainer* trainer, QObject* parent); + static TrainerWrapper* create(const Pokemod::Trainer* trainer, QObject* parent) + { + if (!m_instances.contains(trainer->id())) + m_instances[trainer->id()] = new TrainerWrapper(trainer, parent); + return qobject_cast<TrainerWrapper*>(m_instances[trainer->id()]); + } public slots: QString name() const; int moneyFactor() const; - const SkinWrapper* skin() const; + SkinWrapper* skin(); int depth() const; int teamIntel() const; int moveIntel() const; @@ -44,6 +49,7 @@ class POKESCRIPTING_EXPORT TrainerWrapper : public ObjectWrapper int abilityIntel() const; int statIntel() const; private: + TrainerWrapper(const Pokemod::Trainer* trainer, QObject* parent); TrainerWrapper& operator=(const TrainerWrapper& rhs); const Pokemod::Trainer* m_trainer; @@ -65,9 +71,9 @@ inline int TrainerWrapper::TrainerWrapper::moneyFactor() const return m_trainer->moneyFactor(); } -inline const Pokescripting::SkinWrapper* TrainerWrapper::TrainerWrapper::skin() const +inline Pokescripting::SkinWrapper* TrainerWrapper::TrainerWrapper::skin() { - return new SkinWrapper(pokemod()->skinById(m_trainer->skin()), const_cast<TrainerWrapper*>(this)); + return SkinWrapper::create(pokemod()->skinById(m_trainer->skin()), this); } inline int TrainerWrapper::TrainerWrapper::depth() const |