Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r651) LoadNewGrfFile() now doesn't care about num_sprites and just loads whatever is

Browse Source 
available. Fixes George's long vehicles. (pasky)
This commit is contained in:
miham 2004-11-17 02:24:21 +00:00
parent dd90693a4c
commit 4fb8338fa6
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spritecache.c
View File

@ -308,9 +308,6 @@ static int LoadGrfFile(const char *filename, int load_index, int file_index)
static int LoadNewGrfFile(const char *filename, int load_index, int file_index) static int LoadNewGrfFile(const char *filename, int load_index, int file_index)
{ {
/* XXX: Is it better to fervently follow the num_sprites information or
* be tolerant and comply with more/less sprites too? --pasky */
int num_sprites = 0;
int i; int i;
FioOpenFile(file_index, filename); FioOpenFile(file_index, filename);
@ -321,6 +318,9 @@ static int LoadNewGrfFile(const char *filename, int load_index, int file_index)
DEBUG(spritecache, 2) ("Reading newgrf-file ``%s'' [offset: %u]", DEBUG(spritecache, 2) ("Reading newgrf-file ``%s'' [offset: %u]",
filename, load_index); filename, load_index);
/* Skip the first sprite; we don't care about how many sprites this
* does contain; newest TTDPatches and George's longvehicles don't
* neither, apparently. */
{ {
int length; int length;
byte type; byte type;
@ -329,24 +329,16 @@ static int LoadNewGrfFile(const char *filename, int load_index, int file_index)
type = FioReadByte(); type = FioReadByte();
if ((length == 4) && (type == 0xFF)) { if ((length == 4) && (type == 0xFF)) {
num_sprites = FioReadDword(); FioReadDword();
} else { } else {
error("Custom .grf has invalid format."); error("Custom .grf has invalid format.");
} }
/* Ignore last sprite, it's only used to mark end-of-file */
num_sprites--;
load_index++;
} }
if ((load_index + num_sprites) > NUM_SPRITES) for (i = 0; LoadNextSprite(load_index + i, file_index); i++) {
error("Too many sprites (%x). Recompile with higher NUM_SPRITES value or remove some custom GRF files.", if (load_index + i >= NUM_SPRITES)
load_index + num_sprites); error("Too many sprites (%x). Recompile with higher NUM_SPRITES value or remove some custom GRF files.",
load_index + i);
for (i = 0; i < num_sprites; i++) {
if (!LoadNextSprite(load_index + i, file_index))
error("NEWGRF: Header was talking abount %d sprites, but only %d found..",
num_sprites, i);
} }
/* Clean up. */ /* Clean up. */
@ -354,7 +346,7 @@ static int LoadNewGrfFile(const char *filename, int load_index, int file_index)
memset(_replace_sprites_count, 0, 16 * sizeof(*_replace_sprites_count)); memset(_replace_sprites_count, 0, 16 * sizeof(*_replace_sprites_count));
memset(_replace_sprites_offset, 0, 16 * sizeof(*_replace_sprites_offset)); memset(_replace_sprites_offset, 0, 16 * sizeof(*_replace_sprites_offset));
return num_sprites; return i;
} }
static void LoadGrfIndexed(const char *filename, const uint16 *index_tbl, int file_index) static void LoadGrfIndexed(const char *filename, const uint16 *index_tbl, int file_index)