summaryrefslogtreecommitdiffstats
path: root/sigmodr/MapUI.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 /sigmodr/MapUI.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 'sigmodr/MapUI.cpp')
-rw-r--r--sigmodr/MapUI.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/sigmodr/MapUI.cpp b/sigmodr/MapUI.cpp
index cefb3ee2..a6b575e4 100644
--- a/sigmodr/MapUI.cpp
+++ b/sigmodr/MapUI.cpp
@@ -72,7 +72,11 @@ void Sigmodr::MapUI::refreshGui()
if (sigmod()->spriteIndex(tile->sprite()) == INT_MAX)
varTile->addItem(tile->name(), tile->id());
else
- varTile->addItem(QPixmap::fromImage(sigmod()->spriteById(tile->sprite())->sprite()), tile->name(), tile->id());
+ {
+ QPixmap icon;
+ icon.loadFromData(sigmod()->spriteById(tile->sprite())->sprite());
+ varTile->addItem(icon, tile->name(), tile->id());
+ }
}
varTile->blockSignals(blockedTile);
varTile->setEnabled(false);