Use ResourceRef<Image> in more places

Automatic reference counting of images is now used by Item, Icon,
AnimatedSprite, ImageSprite, ParticleEmitter, Minimap, Desktop and
Emote.

Since ResourceManager::get automatically adds a reference, it needs to
be explicitly subtracted when the resource is managed by ResourceRef.
This is taken care of by the new ResourceManager::getImageRef.

Also removed the apprently unused and duplicate "mDrawImage" from Item
(which also didn't get decRef called on it).

Fixes cleanup of emote ImageSet and ImageSprite instances, as well as
particle images.

1 files changed, 6 insertions, 20 deletions

diff --git a/src/item.cpp b/src/item.cpp
index 30536df0..5ce1fea5 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -36,38 +36,24 @@ Item::Item(int id, int quantity, bool equipped):
     setId(id);
 }
 
-Item::~Item()
-{
-    if (mImage)
-        mImage->decRef();
-}
+Item::~Item() = default;
 
 void Item::setId(int id)
 {
     mId = id;
 
     // Load the associated image
-    if (mImage)
-        mImage->decRef();
-
-    if (mDrawImage)
-        mDrawImage->decRef();
-
     ResourceManager *resman = ResourceManager::getInstance();
-    SpriteDisplay display = getInfo().getDisplay();
-    std::string imagePath = paths.getStringValue("itemIcons")
-                            + display.image;
-    mImage = resman->getImage(imagePath);
-    mDrawImage = resman->getImage(imagePath);
+    const SpriteDisplay &display = getInfo().getDisplay();
+    mImage = resman->getImage(paths.getStringValue("itemIcons") + display.image);
 
     if (!mImage)
         mImage = Theme::getImageFromTheme(paths.getValue("unknownItemFile",
                                                          "unknown-item.png"));
 
-    if (!mDrawImage)
-        mDrawImage = Theme::getImageFromTheme(
-                                            paths.getValue("unknownItemFile",
-                                                           "unknown-item.png"));
+    // Remove the automatic reference added by the ResourceManager
+    if (mImage)
+        mImage->decRef();
 }
 
 void Item::doEvent(Event::Type eventName)