mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r12002) -Cleanup (r11981): Remove obsolete code to skip sprites from indexed GRFs.
This commit is contained in:
parent
d3c7a35d22
commit
1a9b741e43
|
@ -70,20 +70,15 @@ void LoadSpritesIndexed(int file_index, uint *sprite_id, const SpriteID *index_t
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -272,14 +272,6 @@ void DupSprite(SpriteID old_spr, SpriteID new_spr)
|
|||
}
|
||||
|
||||
|
||||
void SkipSprites(uint count)
|
||||
{
|
||||
for (; count > 0; --count) {
|
||||
if (!ReadSpriteHeaderSkipData()) return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#define S_FREE_MASK 1
|
||||
|
||||
static inline MemBlock* NextBlock(MemBlock* block)
|
||||
|
|
|
@ -35,6 +35,5 @@ void IncreaseSpriteLRU();
|
|||
|
||||
bool LoadNextSprite(int load_index, byte file_index, uint file_sprite_id);
|
||||
void DupSprite(SpriteID old_spr, SpriteID new_spr);
|
||||
void SkipSprites(uint count);
|
||||
|
||||
#endif /* SPRITECACHE_H */
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id$ */
|
||||
|
||||
enum {
|
||||
SKIP = 0xFFFE,
|
||||
END = 0xFFFF
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue