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

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index f43aea41..e6600236 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -310,6 +310,13 @@ Image *ResourceManager::getImage(const std::string &idPath)
     }));
 }
 
+ResourceRef<Image> ResourceManager::getImageRef(const std::string &idPath)
+{
+    ResourceRef<Image> img = getImage(idPath);
+    img->decRef();  // remove ref added by ResourceManager::get
+    return img;
+}
+
 ImageSet *ResourceManager::getImageSet(const std::string &imagePath,
                                        int w, int h)
 {
@@ -317,13 +324,11 @@ ImageSet *ResourceManager::getImageSet(const std::string &imagePath,
     ss << imagePath << "[" << w << "x" << h << "]";
 
     return static_cast<ImageSet*>(get(ss.str(), [&] () -> Resource * {
-        Image *img = getImage(imagePath);
+        auto img = getImageRef(imagePath);
         if (!img)
             return nullptr;
 
-        auto *res = new ImageSet(img, w, h);
-        img->decRef();
-        return res;
+        return new ImageSet(img, w, h);
     }));
 }