diff options
author | rubidium <rubidium@openttd.org> | 2008-09-02 15:20:38 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-09-02 15:20:38 +0000 |
commit | c8e8911ef676f503ac5789d3fefac1278cdef971 (patch) | |
tree | e7050537d14303dbc6bc9a461ff38931861cc4aa /src/spritecache.h | |
parent | cbe397388f0ef537b61095b05ee4edfe9dd92202 (diff) | |
download | openttd-c8e8911ef676f503ac5789d3fefac1278cdef971.tar.xz |
(svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites.
Diffstat (limited to 'src/spritecache.h')
-rw-r--r-- | src/spritecache.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/spritecache.h b/src/spritecache.h index 65cc3b95e..76f1073cb 100644 --- a/src/spritecache.h +++ b/src/spritecache.h @@ -17,17 +17,19 @@ struct Sprite { extern uint _sprite_cache_size; -const void *GetRawSprite(SpriteID sprite, bool real_sprite); +const void *GetRawSprite(SpriteID sprite, SpriteType type); bool SpriteExists(SpriteID sprite); -static inline const Sprite *GetSprite(SpriteID sprite) +static inline const Sprite *GetSprite(SpriteID sprite, SpriteType type) { - return (Sprite*)GetRawSprite(sprite, true); + assert(type != ST_RECOLOUR); + return (Sprite*)GetRawSprite(sprite, type); } -static inline const byte *GetNonSprite(SpriteID sprite) +static inline const byte *GetNonSprite(SpriteID sprite, SpriteType type) { - return (byte*)GetRawSprite(sprite, false); + assert(type == ST_RECOLOUR); + return (byte*)GetRawSprite(sprite, type); } void GfxInitSpriteMem(); |