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/MapWildListWrapper.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pokescripting/MapWildListWrapper.h') diff --git a/pokescripting/MapWildListWrapper.h b/pokescripting/MapWildListWrapper.h index cf37a07a..b11a2346 100644 --- a/pokescripting/MapWildListWrapper.h +++ b/pokescripting/MapWildListWrapper.h @@ -32,13 +32,19 @@ class POKESCRIPTING_EXPORT MapWildListWrapper : public ObjectWrapper Q_OBJECT public: - MapWildListWrapper(const Pokemod::MapWildList* wildList, QObject* parent); + static MapWildListWrapper* create(const Pokemod::MapWildList* wildList, QObject* parent) + { + if (!m_instances.contains(wildList->id())) + m_instances[wildList->id()] = new MapWildListWrapper(wildList, parent); + return qobject_cast(m_instances[wildList->id()]); + } public slots: QString name() const; - const MapWildListEncounterWrapper* encounter(const int index) const; + MapWildListEncounterWrapper* encounter(const int index); int encounterCount() const; private: + MapWildListWrapper(const Pokemod::MapWildList* wildList, QObject* parent); MapWildListWrapper& operator=(const MapWildListWrapper& rhs); const Pokemod::MapWildList* m_wildList; @@ -55,9 +61,9 @@ inline QString MapWildListWrapper::name() const return m_wildList->name(); } -inline const MapWildListEncounterWrapper* MapWildListWrapper::encounter(const int index) const +inline MapWildListEncounterWrapper* MapWildListWrapper::encounter(const int index) { - return new MapWildListEncounterWrapper(m_wildList->encounter(index), const_cast(this)); + return MapWildListEncounterWrapper::create(m_wildList->encounter(index), this); } inline int MapWildListWrapper::encounterCount() const -- cgit