Changeset - r17036:17fe560ce56e
[Not reviewed]
master
0 1 0
frosch - 13 years ago 2011-01-14 16:09:51
frosch@openttd.org
(svn r21783) -Cleanup (r14997): Remove redundant assignment.
1 file changed with 0 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/spritecache.cpp
Show inline comments
 
@@ -260,50 +260,48 @@ static void *ReadSprite(SpriteCache *sc,
 
		byte *dest;
 

	
 
		num = width * height;
 
		sprite = (Sprite *)AllocSprite(sizeof(*sprite) + num);
 
		sc->ptr = sprite;
 
		sprite->height = height;
 
		sprite->width  = width;
 
		sprite->x_offs = FioReadWord();
 
		sprite->y_offs = FioReadWord();
 

	
 
		dest = sprite->data;
 
		while (num > 0) {
 
			int8 i = FioReadByte();
 
			if (i >= 0) {
 
				num -= i;
 
				for (; i > 0; --i) *dest++ = FioReadByte();
 
			} else {
 
				const byte *rel = dest - (((i & 7) << 8) | FioReadByte());
 
				i = -(i >> 3);
 
				num -= i;
 
				for (; i > 0; --i) *dest++ = *rel++;
 
			}
 
		}
 

	
 
		sc->type = sprite_type;
 

	
 
		return sc->ptr;
 
	}
 

	
 
	assert(sprite_type == ST_NORMAL || sprite_type == ST_FONT);
 

	
 
	SpriteLoaderGrf sprite_loader;
 
	SpriteLoader::Sprite sprite;
 

	
 
	if (!sprite_loader.LoadSprite(&sprite, file_slot, file_pos, sprite_type)) {
 
		if (id == SPR_IMG_QUERY) usererror("Okay... something went horribly wrong. I couldn't load the fallback sprite. What should I do?");
 
		return (void*)GetRawSprite(SPR_IMG_QUERY, ST_NORMAL);
 
	}
 
	sc->ptr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, &AllocSprite);
 

	
 
	return sc->ptr;
 
}
 

	
 

	
 
bool LoadNextSprite(int load_index, byte file_slot, uint file_sprite_id)
 
{
 
	size_t file_pos = FioGetPos();
 

	
 
	SpriteType type = ReadSpriteHeaderSkipData();
 

	
0 comments (0 inline, 0 general)