From 14dc8218eeebd1583e6bd3c49013b3e501f47228 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 28 Mar 2024 08:02:46 +0100 Subject: Use ResourceRef 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. --- src/animatedsprite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/animatedsprite.h') diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 2c7d589f..05c73ddd 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -87,7 +87,7 @@ class AnimatedSprite final : public Sprite int mFrameIndex = 0; /**< The index of the current frame. */ int mFrameTime = 0; /**< The time since start of frame. */ - SpriteDef *mSprite; /**< The sprite definition. */ + ResourceRef mSprite; /**< The sprite definition. */ Action *mAction = nullptr; /**< The currently active action. */ Animation *mAnimation = nullptr; /**< The currently active animation. */ Frame *mFrame = nullptr; /**< The currently active frame. */ -- cgit v1.2.3-70-g09d2