Mercurial > hg > openttd
changeset 8432:e802c4a2fa5e draft
(svn r12002) -Cleanup (r11981): Remove obsolete code to skip sprites from indexed GRFs.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Mon, 28 Jan 2008 17:51:45 +0000 |
parents | b4a8c17604d0 |
children | ecb823533681 |
files | src/gfxinit.cpp src/spritecache.cpp src/spritecache.h src/table/landscape_sprite.h |
diffstat | 4 files changed, 9 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -70,20 +70,15 @@ while ((start = *index_tbl++) != END) { uint end = *index_tbl++; - if (start == SKIP) { // skip sprites (amount in second var) - SkipSprites(end); - (*sprite_id) += end; - } else { // load sprites and use indexes from start to end - do { - #ifdef NDEBUG - LoadNextSprite(start, file_index, *sprite_id); - #else - bool b = LoadNextSprite(start, file_index, *sprite_id); - assert(b); - #endif - (*sprite_id)++; - } while (++start <= end); - } + do { + #ifdef NDEBUG + LoadNextSprite(start, file_index, *sprite_id); + #else + bool b = LoadNextSprite(start, file_index, *sprite_id); + assert(b); + #endif + (*sprite_id)++; + } while (++start <= end); } }
--- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -272,14 +272,6 @@ } -void SkipSprites(uint count) -{ - for (; count > 0; --count) { - if (!ReadSpriteHeaderSkipData()) return; - } -} - - #define S_FREE_MASK 1 static inline MemBlock* NextBlock(MemBlock* block)