From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [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 --- pokescripting/MapEffectWrapper.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'pokescripting/MapEffectWrapper.h') diff --git a/pokescripting/MapEffectWrapper.h b/pokescripting/MapEffectWrapper.h index c053937f..1a686bb0 100644 --- a/pokescripting/MapEffectWrapper.h +++ b/pokescripting/MapEffectWrapper.h @@ -27,6 +27,7 @@ namespace Pokescripting { // Forward declarations +class MapWrapper; class SkinWrapper; class POKESCRIPTING_EXPORT MapEffectWrapper : public ObjectWrapper @@ -34,20 +35,15 @@ class POKESCRIPTING_EXPORT MapEffectWrapper : public ObjectWrapper Q_OBJECT public: - static MapEffectWrapper* create(const Pokemod::MapEffect* effect, QObject* parent) - { - if (!m_instances.contains(effect->id())) - m_instances[effect->id()] = new MapEffectWrapper(effect, parent); - return qobject_cast(m_instances[effect->id()]); - } - public slots: - QString name() const; - QPoint coordinate() const; - SkinWrapper* skin(); - bool isGhost() const; - Pokemod::Script script() const; + static MapEffectWrapper* create(const Pokemod::MapEffect* effect, MapWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE QPoint coordinate() const; + Q_SCRIPTABLE SkinWrapper* skin(); + Q_SCRIPTABLE bool isGhost() const; + Q_SCRIPTABLE Pokemod::Script script() const; private: - MapEffectWrapper(const Pokemod::MapEffect* effect, QObject* parent); + MapEffectWrapper(const Pokemod::MapEffect* effect, MapWrapper* parent); MapEffectWrapper& operator=(const MapEffectWrapper& rhs); const Pokemod::MapEffect* m_effect; -- cgit