mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r552) -newgrf: Include bits forgotten when merging octo's ReplaceSprites support - it would replace even special sprites in the way now. (pasky)

release/0.4.5
darkvater 2004-11-12 21:33:18 +00:00
parent 2aae43a848
commit 7accdb9003
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spritecache.c
View File

@ -100,6 +100,7 @@ static void ReadSpriteHeaderSkipData(int num, int load_index)
} }
type = FioReadByte(); type = FioReadByte();
_cur_sprite.info = type;
if (type == 0xFF) { if (type == 0xFF) {
/* We need to really skip only special sprites in the deaf /* We need to really skip only special sprites in the deaf
* mode. It won't hurt to proceed regular sprites as usual * mode. It won't hurt to proceed regular sprites as usual
@ -114,7 +115,6 @@ static void ReadSpriteHeaderSkipData(int num, int load_index)
return; return;
} }
_cur_sprite.info = type;
#ifdef WANT_SPRITESIZES #ifdef WANT_SPRITESIZES
_cur_sprite.height = FioReadByte(); _cur_sprite.height = FioReadByte();
_cur_sprite.width = FioReadWord(); _cur_sprite.width = FioReadWord();
@ -724,6 +724,10 @@ static void LoadSpriteTables()
* Keep in mind that when you add a LoadGrfIndexed in the 'if'-section below * Keep in mind that when you add a LoadGrfIndexed in the 'if'-section below
* that you should also add the corresponding FioOpenFile to the 'else'-section * that you should also add the corresponding FioOpenFile to the 'else'-section
* below. * below.
*
* TODO:
* I think we can live entirely without Indexed GRFs, but I have to
* invest that further. --octo
*/ */
// Try to load the sprites from cache // Try to load the sprites from cache