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, 2 insertions, 7 deletions

diff --git a/src/item.h b/src/item.h
index 2be75164..b5dd1fe2 100644
--- a/src/item.h
+++ b/src/item.h
@@ -25,6 +25,7 @@
 #include "event.h"
 
 #include "resources/itemdb.h"
+#include "resources/resource.h"
 
 class Image;
 
@@ -56,11 +57,6 @@ class Item
         Image *getImage() const { return mImage; }
 
         /**
-         * Returns the item image.
-         */
-        Image *getDrawImage() const { return mDrawImage; }
-
-        /**
          * Sets the number of items.
          */
         void setQuantity(int quantity) { mQuantity = quantity; }
@@ -121,8 +117,7 @@ class Item
 
     protected:
         int mId;                        /**< Item type id. */
-        Image *mImage = nullptr;        /**< Item image. */
-        Image *mDrawImage = nullptr;    /**< Draw image. */
+        ResourceRef<Image> mImage;      /**< Item image. */
         int mQuantity;                  /**< Number of items. */
         bool mEquipped;                 /**< Item is equipped. */
         bool mInEquipment = false;      /**< Item is in equipment */