diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-28 08:02:46 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-04-08 20:43:23 +0200 |
| commit | 14dc8218eeebd1583e6bd3c49013b3e501f47228 (patch) | |
| tree | 387778ceddd2165ab033c742e5c0eff583a6327a /src/animatedsprite.h | |
| parent | de442e7b15a52729ba37946e74f2799804a77dab (diff) | |
| download | mana-14dc8218eeebd1583e6bd3c49013b3e501f47228.tar.gz mana-14dc8218eeebd1583e6bd3c49013b3e501f47228.tar.bz2 mana-14dc8218eeebd1583e6bd3c49013b3e501f47228.tar.xz mana-14dc8218eeebd1583e6bd3c49013b3e501f47228.zip | |
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.
Diffstat (limited to 'src/animatedsprite.h')
| -rw-r--r-- | src/animatedsprite.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<SpriteDef> 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. */ |