petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Make SpriteType, CargoSortType, SourceType and ScriptType enum classes. (#10663)

Browse Source 
This avoids a (soft) namespace conflict between the four ST_* enums.
This commit is contained in:
PeterN
2023-04-16 20:00:55 +01:00
committed by GitHub
parent 32c8e7feb8
commit e97bf271dc
42 changed files with 189 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/spritecache.h
View File

@@ -46,13 +46,13 @@ uint GetMaxSpriteID();
static inline const Sprite *GetSprite(SpriteID sprite, SpriteType type)
{
assert(type != ST_RECOLOUR);
assert(type != SpriteType::Recolour);
return (Sprite*)GetRawSprite(sprite, type);
}
static inline const byte *GetNonSprite(SpriteID sprite, SpriteType type)
{
assert(type == ST_RECOLOUR);
assert(type == SpriteType::Recolour);
return (byte*)GetRawSprite(sprite, type);
}