summaryrefslogtreecommitdiffstats
path: root/sigscript/SpriteWrapper.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-10-13 21:05:50 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-10-13 21:05:50 +0000
commit460e7bdf3f6c1de69f41b02a16deb85522ae3c49 (patch)
tree3b80ad00d5f021f63d3f890af2e017af314d2106 /sigscript/SpriteWrapper.cpp
parentb427a8cdf13aabe59af60acf0a4264d84ae3ff7a (diff)
downloadsigen-460e7bdf3f6c1de69f41b02a16deb85522ae3c49.tar.gz
sigen-460e7bdf3f6c1de69f41b02a16deb85522ae3c49.tar.xz
sigen-460e7bdf3f6c1de69f41b02a16deb85522ae3c49.zip
[FIX] Sprite no longer stores a QImage, but a QByteArray
[FIX] Preparing for move to a collaged map instead of a tiled map git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@278 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigscript/SpriteWrapper.cpp')
-rw-r--r--sigscript/SpriteWrapper.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/sigscript/SpriteWrapper.cpp b/sigscript/SpriteWrapper.cpp
index 4b972574..6a1c9614 100644
--- a/sigscript/SpriteWrapper.cpp
+++ b/sigscript/SpriteWrapper.cpp
@@ -39,7 +39,9 @@ QString Sigscript::SpriteWrapper::name() const
return m_sprite->name();
}
-QImage Sigscript::SpriteWrapper::sprite() const
+QPixmap Sigscript::SpriteWrapper::sprite() const
{
- return m_sprite->sprite();
+ QPixmap pixmap;
+ pixmap.loadFromData(m_sprite->sprite());
+ return pixmap;
}