1
0
Fork 0

Codechange: do not use ZeroedMemoryAllocator for NewGRFSpriteLayout

pull/13363/head
Rubidium 2025-01-23 18:56:59 +01:00
parent aef53dc059
commit d16cee7bd3
2 changed files with 4 additions and 4 deletions

View File

@ -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 * In contrast to #DrawTileSprites this struct is for allocated
* layouts on the heap. It allocates data and frees them on destruction. * layouts on the heap. It allocates data and frees them on destruction.
*/ */
struct NewGRFSpriteLayout : ZeroedMemoryAllocator, DrawTileSprites { struct NewGRFSpriteLayout : DrawTileSprites {
std::vector<DrawTileSeqStruct> seq; std::vector<DrawTileSeqStruct> seq{};
std::vector<TileLayoutRegisters> registers; std::vector<TileLayoutRegisters> registers{};
/** /**
* Number of sprites in all referenced spritesets. * Number of sprites in all referenced spritesets.

View File

@ -44,7 +44,7 @@ struct DrawTileSeqStruct {
* For allocated ones from NewGRF see #NewGRFSpriteLayout. * For allocated ones from NewGRF see #NewGRFSpriteLayout.
*/ */
struct DrawTileSprites { struct DrawTileSprites {
PalSpriteID ground; ///< Palette and sprite for the ground PalSpriteID ground{}; ///< Palette and sprite for the ground
DrawTileSprites(PalSpriteID ground) : ground(ground) {} DrawTileSprites(PalSpriteID ground) : ground(ground) {}
DrawTileSprites() = default; DrawTileSprites() = default;