From 56b91df6010a9f3d304438cf95816399a6e46622 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 4 Aug 2008 23:06:44 +0000 Subject: [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 --- pokescripting/MoveWrapper.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pokescripting/MoveWrapper.h') diff --git a/pokescripting/MoveWrapper.h b/pokescripting/MoveWrapper.h index 7dbb48cf..aac393a9 100644 --- a/pokescripting/MoveWrapper.h +++ b/pokescripting/MoveWrapper.h @@ -32,17 +32,23 @@ class POKESCRIPTING_EXPORT MoveWrapper : public ObjectWrapper Q_OBJECT public: - MoveWrapper(const Pokemod::Move* move, QObject* parent); + static MoveWrapper* create(const Pokemod::Move* move, QObject* parent) + { + if (!m_instances.contains(move->id())) + m_instances[move->id()] = new MoveWrapper(move, parent); + return qobject_cast(m_instances[move->id()]); + } public slots: QString name() const; Pokemod::Fraction accuracy() const; int power() const; - const TypeWrapper* type() const; + TypeWrapper* type(); bool special() const; int powerPoints() const; int priority() const; QString description() const; private: + MoveWrapper(const Pokemod::Move* move, QObject* parent); MoveWrapper& operator=(const MoveWrapper& rhs); const Pokemod::Move* m_move; @@ -69,9 +75,9 @@ inline int MoveWrapper::power() const return m_move->power(); } -inline const TypeWrapper* MoveWrapper::type() const +inline TypeWrapper* MoveWrapper::type() { - return new TypeWrapper(pokemod()->typeById(m_move->type()), const_cast(this)); + return TypeWrapper::create(pokemod()->typeById(m_move->type()), this); } inline bool MoveWrapper::special() const -- cgit