summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-12 01:20:08 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-12 01:20:08 +0300
commit019173b7f5a1944a1e31ce36c1d23834a1613da6 (patch)
tree99387e1d16c8ecc1cf2f28a41b45662d1e8581fb
parentb73e6b64694fab45242835f27e156bc2ac58c629 (diff)
downloadmv-019173b7f5a1944a1e31ce36c1d23834a1613da6.tar.gz
mv-019173b7f5a1944a1e31ce36c1d23834a1613da6.tar.bz2
mv-019173b7f5a1944a1e31ce36c1d23834a1613da6.tar.xz
mv-019173b7f5a1944a1e31ce36c1d23834a1613da6.zip
Fix loading error sprite for missing emotes.
-rw-r--r--src/resources/db/emotedb.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 2d8804630..40d59d780 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -49,8 +49,9 @@ void EmoteDB::load()
unload();
EmoteSprite *const unknownSprite = new EmoteSprite;
- unknownSprite->sprite = AnimatedSprite::load(
- paths.getStringValue("spriteErrorFile"));
+ unknownSprite->sprite = AnimatedSprite::load(paths.getStringValue(
+ "sprites").append(paths.getStringValue(
+ "spriteErrorFile")));
unknownSprite->name = "unknown";
unknownSprite->id = 0;
mUnknown.sprites.push_back(unknownSprite);