diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 03:27:13 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 03:27:13 +0000 |
| commit | 373e686bf4ecaaabcf80544e74f017eebe05213f (patch) | |
| tree | cddf7a223f16944b0380386e568f2606f634c366 /pokescripting/TileWrapper.h | |
| parent | 63417b1c5057d22bd853e92cd3a25aa812b8d917 (diff) | |
| download | sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.gz sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.xz sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.zip | |
[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
Diffstat (limited to 'pokescripting/TileWrapper.h')
| -rw-r--r-- | pokescripting/TileWrapper.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pokescripting/TileWrapper.h b/pokescripting/TileWrapper.h index c78a2cea..babc304e 100644 --- a/pokescripting/TileWrapper.h +++ b/pokescripting/TileWrapper.h @@ -20,6 +20,7 @@ // Pokescripting includes #include "ObjectWrapper.h" +#include "SpriteWrapper.h" // Pokemod includes #include "../pokemod/Tile.h" @@ -34,7 +35,7 @@ class POKESCRIPTING_EXPORT TileWrapper : public ObjectWrapper TileWrapper(const Pokemod::Tile* tile, QObject* parent); public slots: QString name() const; - QPixmap sprite() const; + const SpriteWrapper* sprite() const; bool from(const int direction) const; private: TileWrapper& operator=(const TileWrapper& rhs); @@ -53,9 +54,9 @@ inline QString TileWrapper::name() const return m_tile->name(); } -inline QPixmap TileWrapper::sprite() const +inline const Pokescripting::SpriteWrapper* TileWrapper::sprite() const { - return m_tile->sprite(); + return new SpriteWrapper(pokemod()->spriteById(m_tile->sprite()), const_cast<TileWrapper*>(this)); } inline bool TileWrapper::from(const int direction) const |