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

diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 6694321c..d1c32d8c 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -22,6 +22,8 @@
 #ifndef RESOURCE_MANAGER_H
 #define RESOURCE_MANAGER_H
 
+#include "resources/resource.h"
+
 #include <ctime>
 #include <functional>
 #include <map>
@@ -31,7 +33,6 @@
 class Image;
 class ImageSet;
 class Music;
-class Resource;
 class SoundEffect;
 class SpriteDef;
 
@@ -144,6 +145,12 @@ class ResourceManager
 
         /**
          * Convenience wrapper around ResourceManager::get for loading
+         * images. Returns an automatically reference-counted resource.
+         */
+        ResourceRef<Image> getImageRef(const std::string &idPath);
+
+        /**
+         * Convenience wrapper around ResourceManager::get for loading
          * songs.
          */
         Music *getMusic(const std::string &idPath);