From 2b014ba1d92e8e45f7e5931845cbc63f8619d589 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Sat, 8 May 2021 14:02:42 +0200 Subject: [PATCH] Fix fdc11a9: Missing sprite count determined on the wrong file (cherry picked from commit de940b1dbc7a1d6f245f3965bc43e8885b690441) --- src/gfxinit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 94318d2170..754ce12f82 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -229,7 +229,8 @@ static void LoadSpriteTables() GRFConfig *top = _grfconfig; /* 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; FillGRFDetails(master, false, BASESET_DIR); ClrBit(master->flags, GCF_INIT_ONLY); @@ -256,7 +257,7 @@ static void LoadSpriteTables() LoadNewGRF(SPR_NEWGRFS_BASE, 2); 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); /* The original baseset extra graphics intentionally make use of the fallback graphics.