(svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites.

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();