summaryrefslogtreecommitdiff
path: root/src/actorsprite.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-20 00:34:39 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-21 00:59:10 +0300
commitaa68511ad3d339be8c8f42fc6c083b696d8e687b (patch)
tree1bf138439c28b4a879c6b35e4361801bd5e1d246 /src/actorsprite.cpp
parent12002b81544038bc5855189c74aca761d0c08f1b (diff)
downloadmv-aa68511ad3d339be8c8f42fc6c083b696d8e687b.tar.gz
mv-aa68511ad3d339be8c8f42fc6c083b696d8e687b.tar.bz2
mv-aa68511ad3d339be8c8f42fc6c083b696d8e687b.tar.xz
mv-aa68511ad3d339be8c8f42fc6c083b696d8e687b.zip
Add delayed images load.
Can work for now only in OpenGL modes.
Diffstat (limited to 'src/actorsprite.cpp')
-rw-r--r--src/actorsprite.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 7bd496d30..b78f6bb91 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -332,7 +332,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
+ combineDye2((*it)->sprite, color);
int variant = (*it)->variant;
- addSprite(AnimatedSprite::load(file, variant));
+ addSprite(AnimatedSprite::delayedLoad(file, variant));
}
// Ensure that something is shown, if desired
@@ -340,7 +340,8 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
if (display.image.empty())
{
- addSprite(AnimatedSprite::load(paths.getStringValue("sprites")
+ addSprite(AnimatedSprite::delayedLoad(
+ paths.getStringValue("sprites")
+ paths.getStringValue("spriteErrorFile")));
}
else