Particle images are now reference-counted properly. Avoided attempts to load "data/graphics/" when a monster or equipment piece has no sprite. Error placeholder is now used when attempting to load a sprite definition file that doesn't exist.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/player.cpp b/src/player.cpp
index a1a86587..3d8a8b6e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -153,8 +153,15 @@ void Player::setSprite(int slot, int id, std::string color)
     }
     else
     {
-        AnimatedSprite *equipmentSprite = AnimatedSprite::load(
-            "graphics/sprites/" + ItemDB::get(id).getSprite(mGender) + "|" + color);
+        std::string filename = ItemDB::get(id).getSprite(mGender);
+        AnimatedSprite *equipmentSprite = NULL;
+
+        if (filename != "")
+        {
+            if (color!="") filename += "|" + color;
+            equipmentSprite = AnimatedSprite::load(
+                "graphics/sprites/" + filename);
+        }
 
         if (equipmentSprite)
             equipmentSprite->setDirection(getSpriteDirection());