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, 1 deletions

diff --git a/src/imagesprite.h b/src/imagesprite.h
index 5a04f9ed..4fc69927 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -60,8 +60,13 @@ public:
     int getDuration() const override
     { return 0; }
 
+    // Hack to allow the ImageSprite to be used with SubImage instances, which
+    // are not reference counted.
+    void releaseImageRef()
+    { mImage.release(); }
+
 private:
-    Image *mImage;
+    ResourceRef<Image> mImage;
 };
 
 #endif // IMAGESPRITE_H