From 3b83cc89885788de19b09f5e9e55c5d3ad7c60c9 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 16 Oct 2008 23:36:56 +0000 Subject: [FIX] Signature is fixed in Sigscript [FIX] Hat cleaned up a bit git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@279 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- sigscript/SpriteWrapper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sigscript/SpriteWrapper.cpp') diff --git a/sigscript/SpriteWrapper.cpp b/sigscript/SpriteWrapper.cpp index 6a1c9614..7cb2074b 100644 --- a/sigscript/SpriteWrapper.cpp +++ b/sigscript/SpriteWrapper.cpp @@ -23,15 +23,17 @@ Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* sprite, SigmodWrapper* parent) { - if (!m_instances.contains(Signature(parent, sprite->id()))) - m_instances[Signature(parent, sprite->id())] = new SpriteWrapper(sprite, parent); - return qobject_cast(m_instances[Signature(parent, sprite->id())]); + Signature sig = Signature(parent, Subsignature(sprite->className(), sprite->id())); + if (!m_instances.contains(sig)) + m_instances[sig] = new SpriteWrapper(sprite, parent); + return qobject_cast(m_instances[sig]); } Sigscript::SpriteWrapper::SpriteWrapper(const Sigmod::Sprite* sprite, SigmodWrapper* parent) : ObjectWrapper(sprite, parent), m_sprite(sprite) { + m_pixmap.loadFromData(m_sprite->sprite()); } QString Sigscript::SpriteWrapper::name() const @@ -41,7 +43,5 @@ QString Sigscript::SpriteWrapper::name() const QPixmap Sigscript::SpriteWrapper::sprite() const { - QPixmap pixmap; - pixmap.loadFromData(m_sprite->sprite()); - return pixmap; + return m_pixmap; } -- cgit