From 460e7bdf3f6c1de69f41b02a16deb85522ae3c49 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Mon, 13 Oct 2008 21:05:50 +0000
Subject: [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
---
 sigscript/SpriteWrapper.cpp | 6 ++++--
 sigscript/SpriteWrapper.h   | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'sigscript')

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;
 }
diff --git a/sigscript/SpriteWrapper.h b/sigscript/SpriteWrapper.h
index 5d35563b..4451852e 100644
--- a/sigscript/SpriteWrapper.h
+++ b/sigscript/SpriteWrapper.h
@@ -24,6 +24,9 @@
 // Sigmod includes
 #include "../sigmod/Sprite.h"
 
+// Qt includes
+#include <QtGui/QPixmap>
+
 namespace Sigscript
 {
 class SIGSCRIPT_EXPORT SpriteWrapper : public ObjectWrapper
@@ -34,7 +37,7 @@ class SIGSCRIPT_EXPORT SpriteWrapper : public ObjectWrapper
         static SpriteWrapper* create(const Sigmod::Sprite* sprite, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE QImage sprite() const;
+        Q_SCRIPTABLE QPixmap sprite() const;
     private:
         SpriteWrapper(const Sigmod::Sprite* sprite, SigmodWrapper* parent);
         SpriteWrapper& operator=(const SpriteWrapper& rhs);
-- 
cgit