From d16cee7bd35f8bdb52f4b5f2913aedfeb486f0f0 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Thu, 23 Jan 2025 18:56:59 +0100 Subject: [PATCH] Codechange: do not use ZeroedMemoryAllocator for NewGRFSpriteLayout --- src/newgrf_commons.h | 6 +++--- src/sprite.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h index fc7d407796..13e0f9a053 100644 --- a/src/newgrf_commons.h +++ b/src/newgrf_commons.h @@ -109,9 +109,9 @@ static const uint TLR_MAX_VAR10 = 7; ///< Maximum value for var 10. * In contrast to #DrawTileSprites this struct is for allocated * layouts on the heap. It allocates data and frees them on destruction. */ -struct NewGRFSpriteLayout : ZeroedMemoryAllocator, DrawTileSprites { - std::vector seq; - std::vector registers; +struct NewGRFSpriteLayout : DrawTileSprites { + std::vector seq{}; + std::vector registers{}; /** * Number of sprites in all referenced spritesets. diff --git a/src/sprite.h b/src/sprite.h index b330e63895..c9a89ce163 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -44,7 +44,7 @@ struct DrawTileSeqStruct { * For allocated ones from NewGRF see #NewGRFSpriteLayout. */ struct DrawTileSprites { - PalSpriteID ground; ///< Palette and sprite for the ground + PalSpriteID ground{}; ///< Palette and sprite for the ground DrawTileSprites(PalSpriteID ground) : ground(ground) {} DrawTileSprites() = default;