From 82f38f45d351cd08ab834de913b51b5b891532d0 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Sun, 16 Apr 2006 11:26:23 +0000
Subject: (svn r4446) - Add function to determine if a Sprite ID exists.

---
 spritecache.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'spritecache.c')

diff --git a/spritecache.c b/spritecache.c
index d7357f7f2..555304f77 100644
--- a/spritecache.c
+++ b/spritecache.c
@@ -71,6 +71,13 @@ static bool ReadSpriteHeaderSkipData(void)
 	return true;
 }
 
+/* Check if the given Sprite ID exists */
+bool SpriteExists(SpriteID id)
+{
+	/* Special case for Sprite ID zero -- its position is also 0... */
+	return _sprite_file_pos[id] != 0 || id == 0;
+}
+
 static void* AllocSprite(size_t);
 
 static void* ReadSprite(SpriteID id)
@@ -80,7 +87,7 @@ static void* ReadSprite(SpriteID id)
 
 	DEBUG(spritecache, 9) ("load sprite %d", id);
 
-	if (_sprite_file_pos[id] == 0 && id != 0) {
+	if (!SpriteExists(id)) {
 		error(
 			"Tried to load non-existing sprite #%d.\n"
 			"Probable cause: Wrong/missing NewGRFs",
-- 
cgit v1.2.3-54-g00ecf