summaryrefslogtreecommitdiff
path: root/src/newgrf_spritegroup.h
diff options
context:
space:
mode:
authorPeter Nelson <peter1138@openttd.org>2021-05-01 23:58:18 +0100
committerPeterN <peter@fuzzle.org>2021-05-02 09:41:01 +0100
commitf785a70a2bc08eaefcb1e2a43b8e6d36a154a00e (patch)
tree3d2b4cc2a61484c6ea6876b4c8eda2a85ab408d7 /src/newgrf_spritegroup.h
parente097c83c83ac3be81041a67f8d641650045502fb (diff)
downloadopenttd-f785a70a2bc08eaefcb1e2a43b8e6d36a154a00e.tar.xz
Cleanup: Use std::vector in RealSpriteGroup.
Diffstat (limited to 'src/newgrf_spritegroup.h')
-rw-r--r--src/newgrf_spritegroup.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 80f70df55..a931597a0 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -78,7 +78,6 @@ public:
* groups. */
struct RealSpriteGroup : SpriteGroup {
RealSpriteGroup() : SpriteGroup(SGT_REAL) {}
- ~RealSpriteGroup();
/* Loaded = in motion, loading = not moving
* Each group contains several spritesets, for various loading stages */
@@ -87,10 +86,8 @@ struct RealSpriteGroup : SpriteGroup {
* with small amount of cargo whilst loading is for stations with a lot
* of da stuff. */
- byte num_loaded; ///< Number of loaded groups
- byte num_loading; ///< Number of loading groups
- const SpriteGroup **loaded; ///< List of loaded groups (can be SpriteIDs or Callback results)
- const SpriteGroup **loading; ///< List of loading groups (can be SpriteIDs or Callback results)
+ std::vector<const SpriteGroup *> loaded; ///< List of loaded groups (can be SpriteIDs or Callback results)
+ std::vector<const SpriteGroup *> loading; ///< List of loading groups (can be SpriteIDs or Callback results)
protected:
const SpriteGroup *Resolve(ResolverObject &object) const;