mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: do not use ZeroedMemoryAllocator for NewGRFSpriteLayout

pull/13582/head
Rubidium 2025-01-23 18:56:59 +01:00 committed by rubidium42
parent 2d30df8110
commit 11d48aa47c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx_type.h
View File

@ -20,8 +20,8 @@ typedef uint32_t CursorID; ///< The number of the cursor (sprite)
/** Combination of a palette sprite and a 'real' sprite */ /** Combination of a palette sprite and a 'real' sprite */
struct PalSpriteID { struct PalSpriteID {
SpriteID sprite; ///< The 'real' sprite SpriteID sprite{}; ///< The 'real' sprite
PaletteID pal; ///< The palette (use \c PAL_NONE) if not needed) PaletteID pal{}; ///< The palette (use \c PAL_NONE) if not needed)
}; };
enum WindowKeyCodes : uint16_t { enum WindowKeyCodes : uint16_t {

6
src/newgrf_commons.h
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.

2
src/sprite.h
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;