diff options
| author | Peter Nelson <peter1138@openttd.org> | 2021-05-01 23:58:18 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2021-05-02 09:41:01 +0100 |
| commit | f785a70a2bc08eaefcb1e2a43b8e6d36a154a00e (patch) | |
| tree | 3d2b4cc2a61484c6ea6876b4c8eda2a85ab408d7 /src/newgrf.cpp | |
| parent | e097c83c83ac3be81041a67f8d641650045502fb (diff) | |
| download | openttd-f785a70a2bc08eaefcb1e2a43b8e6d36a154a00e.tar.xz | |
Cleanup: Use std::vector in RealSpriteGroup.
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 19cc436dd..1d30cb2d7 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5181,23 +5181,18 @@ static void NewSpriteGroup(ByteReader *buf) group->nfo_line = _cur.nfo_line; act_group = group; - group->num_loaded = num_loaded; - group->num_loading = num_loading; - if (num_loaded > 0) group->loaded = CallocT<const SpriteGroup*>(num_loaded); - if (num_loading > 0) group->loading = CallocT<const SpriteGroup*>(num_loading); - grfmsg(6, "NewSpriteGroup: New SpriteGroup 0x%02X, %u loaded, %u loading", setid, num_loaded, num_loading); for (uint i = 0; i < num_loaded; i++) { uint16 spriteid = buf->ReadWord(); - group->loaded[i] = CreateGroupFromGroupID(feature, setid, type, spriteid); + group->loaded.push_back(CreateGroupFromGroupID(feature, setid, type, spriteid)); grfmsg(8, "NewSpriteGroup: + rg->loaded[%i] = subset %u", i, spriteid); } for (uint i = 0; i < num_loading; i++) { uint16 spriteid = buf->ReadWord(); - group->loading[i] = CreateGroupFromGroupID(feature, setid, type, spriteid); + group->loading.push_back(CreateGroupFromGroupID(feature, setid, type, spriteid)); grfmsg(8, "NewSpriteGroup: + rg->loading[%i] = subset %u", i, spriteid); } |