summaryrefslogtreecommitdiff
path: root/spritecache.c
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2004-11-12 21:33:18 +0000
committerdarkvater <darkvater@openttd.org>2004-11-12 21:33:18 +0000
commit7accdb9003a1aaf12944ddd947fab6dfb4f7fa1d (patch)
treefc4e842320077939a686ed3f0330e914479bf7f2 /spritecache.c
parent2aae43a848a6d5f7336955fcf7bf3bfcd07f0023 (diff)
downloadopenttd-7accdb9003a1aaf12944ddd947fab6dfb4f7fa1d.tar.xz
(svn r552) -newgrf: Include bits forgotten when merging octo's ReplaceSprites support - it would replace even special sprites in the way now. (pasky)
Diffstat (limited to 'spritecache.c')
-rw-r--r--spritecache.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/spritecache.c b/spritecache.c
index 5be0fb785..5b2051f7f 100644
--- a/spritecache.c
+++ b/spritecache.c
@@ -100,6 +100,7 @@ static void ReadSpriteHeaderSkipData(int num, int load_index)
}
type = FioReadByte();
+ _cur_sprite.info = type;
if (type == 0xFF) {
/* We need to really skip only special sprites in the deaf
* mode. It won't hurt to proceed regular sprites as usual
@@ -114,7 +115,6 @@ static void ReadSpriteHeaderSkipData(int num, int load_index)
return;
}
- _cur_sprite.info = type;
#ifdef WANT_SPRITESIZES
_cur_sprite.height = FioReadByte();
_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
* that you should also add the corresponding FioOpenFile to the 'else'-section
* 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