From 373e686bf4ecaaabcf80544e74f017eebe05213f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 4 Aug 2008 03:27:13 +0000 Subject: [FIX] Cleaned up the RC file [FIX] Script editing is getting there (still a little weird...) [FIX] Cleaned up the main file a bit [FIX] Added the Skin class [FIX] All sprites and skins are internally linked now [FIX] No more image restraints (tiles are still enforced so that map editing works) [FIX] Cleaned up checking for valid values when setting in pokemod [FIX] Removed FileDialog files git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@233 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokescripting/MapEffectWrapper.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pokescripting/MapEffectWrapper.h') diff --git a/pokescripting/MapEffectWrapper.h b/pokescripting/MapEffectWrapper.h index 161838e2..bf2bb127 100644 --- a/pokescripting/MapEffectWrapper.h +++ b/pokescripting/MapEffectWrapper.h @@ -20,6 +20,7 @@ // Pokescripting includes #include "ObjectWrapper.h" +#include "SkinWrapper.h" // Pokemod includes #include "../pokemod/MapEffect.h" @@ -34,7 +35,7 @@ class POKESCRIPTING_EXPORT MapEffectWrapper : public ObjectWrapper MapEffectWrapper(const Pokemod::MapEffect* effect, QObject* parent); public slots: QString name() const; - QPixmap skin() const; + const SkinWrapper* skin() const; bool isGhost() const; private: MapEffectWrapper& operator=(const MapEffectWrapper& rhs); @@ -53,9 +54,9 @@ inline QString MapEffectWrapper::name() const return m_effect->name(); } -inline QPixmap MapEffectWrapper::skin() const +inline const Pokescripting::SkinWrapper* MapEffectWrapper::skin() const { - return m_effect->skin(); + return new SkinWrapper(pokemod()->skinById(m_effect->skin()), const_cast(this)); } inline bool MapEffectWrapper::isGhost() const -- cgit