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, 4 insertions, 17 deletions

diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index f552a570..8208a5d8 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -102,7 +102,7 @@ ItemPopup::ItemPopup():
     mItemWeight = new TextBox;
     mItemWeight->setEditable(false);
 
-    mIcon = new Icon(nullptr);
+    mIcon = new Icon;
 
     add(mItemName);
     add(mItemDesc);
@@ -113,15 +113,7 @@ ItemPopup::ItemPopup():
     addMouseListener(this);
 }
 
-ItemPopup::~ItemPopup()
-{
-    if (mIcon)
-    {
-        Image *image = mIcon->getImage();
-        if (image)
-            image->decRef();
-    }
-}
+ItemPopup::~ItemPopup() = default;
 
 void ItemPopup::setEquipmentText(const std::string& text)
 {
@@ -158,16 +150,11 @@ void ItemPopup::setItem(const ItemInfo &item, bool showImage)
 
     int space = 0;
 
-    Image *oldImage = mIcon->getImage();
-    if (oldImage)
-        oldImage->decRef();
-
     if (showImage)
     {
         ResourceManager *resman = ResourceManager::getInstance();
-        Image *image = resman->getImage(
-                                  paths.getStringValue("itemIcons")
-                                  + item.getDisplay().image);
+        auto image = resman->getImageRef(paths.getStringValue("itemIcons") +
+                                         item.getDisplay().image);
 
         mIcon->setImage(image);
         if (image)