[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

1 files changed, 7 insertions, 1 deletions

diff --git a/pokescripting/NatureWrapper.h b/pokescripting/NatureWrapper.h
index 776716cf..14a87ae8 100644
--- a/pokescripting/NatureWrapper.h
+++ b/pokescripting/NatureWrapper.h
@@ -31,12 +31,18 @@ class POKESCRIPTING_EXPORT NatureWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        NatureWrapper(const Pokemod::Nature* nature, QObject* parent);
+        static NatureWrapper* create(const Pokemod::Nature* nature, QObject* parent)
+        {
+            if (!m_instances.contains(nature->id()))
+                m_instances[nature->id()] = new NatureWrapper(nature, parent);
+            return qobject_cast<NatureWrapper*>(m_instances[nature->id()]);
+        }
     public slots:
         QString name() const;
         Pokemod::Fraction stat(const int stat) const;
         int weight() const;
     private:
+        NatureWrapper(const Pokemod::Nature* nature, QObject* parent);
         NatureWrapper& operator=(const NatureWrapper& rhs);
         
         const Pokemod::Nature* m_nature;