mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix fdc11a9: Missing sprite count determined on the wrong file

This commit is contained in:
rubidium42 2021-05-08 14:02:42 +02:00 committed by rubidium42
parent fa6abe1646
commit de940b1dbc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gfxinit.cpp
View File

@ -195,7 +195,8 @@ static void LoadSpriteTables()
GRFConfig *top = _grfconfig; GRFConfig *top = _grfconfig;
/* Default extra graphics */ /* Default extra graphics */
GRFConfig *master = new GRFConfig("OPENTTD.GRF"); static const char *master_filename = "OPENTTD.GRF";
GRFConfig *master = new GRFConfig(master_filename);
master->palette |= GRFP_GRF_DOS; master->palette |= GRFP_GRF_DOS;
FillGRFDetails(master, false, BASESET_DIR); FillGRFDetails(master, false, BASESET_DIR);
ClrBit(master->flags, GCF_INIT_ONLY); ClrBit(master->flags, GCF_INIT_ONLY);
@ -222,7 +223,7 @@ static void LoadSpriteTables()
LoadNewGRF(SPR_NEWGRFS_BASE, 2); LoadNewGRF(SPR_NEWGRFS_BASE, 2);
uint total_extra_graphics = SPR_NEWGRFS_BASE - SPR_OPENTTD_BASE; uint total_extra_graphics = SPR_NEWGRFS_BASE - SPR_OPENTTD_BASE;
_missing_extra_graphics = GetSpriteCountForFile(used_set->files[GFT_EXTRA].filename, SPR_OPENTTD_BASE, SPR_NEWGRFS_BASE); _missing_extra_graphics = GetSpriteCountForFile(master_filename, SPR_OPENTTD_BASE, SPR_NEWGRFS_BASE);
DEBUG(sprite, 1, "%u extra sprites, %u from baseset, %u from fallback", total_extra_graphics, total_extra_graphics - _missing_extra_graphics, _missing_extra_graphics); DEBUG(sprite, 1, "%u extra sprites, %u from baseset, %u from fallback", total_extra_graphics, total_extra_graphics - _missing_extra_graphics, _missing_extra_graphics);
/* The original baseset extra graphics intentionally make use of the fallback graphics. /* The original baseset extra graphics intentionally make use of the fallback graphics.