From 1e0dd39075a211e3104262264e00025cac9f242a Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 6 Oct 2013 19:40:40 +0000 Subject: (svn r25821) -Fix-ish: Sprite 0 was considered available, even if no baseset was loaded. --- src/spritecache.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/spritecache.cpp') diff --git a/src/spritecache.cpp b/src/spritecache.cpp index 3ddcaaf36..3ffd74a8c 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -118,9 +118,10 @@ bool SkipSpriteData(byte type, uint16 num) /* Check if the given Sprite ID exists */ bool SpriteExists(SpriteID id) { + if (id >= _spritecache_items) return false; + /* Special case for Sprite ID zero -- its position is also 0... */ if (id == 0) return true; - if (id >= _spritecache_items) return false; return !(GetSpriteCache(id)->file_pos == 0 && GetSpriteCache(id)->file_slot == 0); } -- cgit v1.2.3-54-g00ecf