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

Codechange: Remove SpriteTypeByte type

pull/7551/head
Charles Pigott 2019-04-22 07:22:06 +01:00 committed by PeterN
parent 119ea7a195
commit 10ba431d21
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx_type.h
View File

@ -294,7 +294,7 @@ enum PaletteType {
}; };
/** Types of sprites that might be loaded */ /** Types of sprites that might be loaded */
enum SpriteType { enum SpriteType : byte {
ST_NORMAL = 0, ///< The most basic (normal) sprite ST_NORMAL = 0, ///< The most basic (normal) sprite
ST_MAPGEN = 1, ///< Special sprite for the map generator ST_MAPGEN = 1, ///< Special sprite for the map generator
ST_FONT = 2, ///< A sprite used for fonts ST_FONT = 2, ///< A sprite used for fonts

4
src/spritecache.cpp
View File

@ -29,15 +29,13 @@
/* Default of 4MB spritecache */ /* Default of 4MB spritecache */
uint _sprite_cache_size = 4; uint _sprite_cache_size = 4;
typedef SimpleTinyEnumT<SpriteType, byte> SpriteTypeByte;
struct SpriteCache { struct SpriteCache {
void *ptr; void *ptr;
size_t file_pos; size_t file_pos;
uint32 id; uint32 id;
uint16 file_slot; uint16 file_slot;
int16 lru; int16 lru;
SpriteTypeByte type; ///< In some cases a single sprite is misused by two NewGRFs. Once as real sprite and once as recolour sprite. If the recolour sprite gets into the cache it might be drawn as real sprite which causes enormous trouble. SpriteType type; ///< In some cases a single sprite is misused by two NewGRFs. Once as real sprite and once as recolour sprite. If the recolour sprite gets into the cache it might be drawn as real sprite which causes enormous trouble.
bool warned; ///< True iff the user has been warned about incorrect use of this sprite bool warned; ///< True iff the user has been warned about incorrect use of this sprite
byte container_ver; ///< Container version of the GRF the sprite is from. byte container_ver; ///< Container version of the GRF the sprite is from.
}; };