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

(svn r11191) -Fix [FS#1227]: GLS_ACTIVATION stage must be done immediatly after GLS_RESERVE stage, before the GLS_RESERVE stage for the next newgrf.

Browse Source
This commit is contained in:
glx 2007-10-01 18:59:25 +00:00
parent 7adec5da36
commit 06059e1f2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@ -5495,7 +5495,7 @@ void LoadNewGRF(uint load_index, uint file_index)
/* Load newgrf sprites /* Load newgrf sprites
* in each loading stage, (try to) open each file specified in the config * in each loading stage, (try to) open each file specified in the config
* and load information from it. */ * and load information from it. */
for (GrfLoadingStage stage = GLS_LABELSCAN; stage <= GLS_ACTIVATION; stage++) { for (GrfLoadingStage stage = GLS_LABELSCAN; stage < GLS_ACTIVATION; stage++) {
uint slot = file_index; uint slot = file_index;
_cur_stage = stage; _cur_stage = stage;
@ -5511,7 +5511,7 @@ void LoadNewGRF(uint load_index, uint file_index)
LoadNewGRFFile(c, slot++, stage); LoadNewGRFFile(c, slot++, stage);
if (stage == GLS_RESERVE) { if (stage == GLS_RESERVE) {
if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED; if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
} else if (stage == GLS_ACTIVATION) { LoadNewGRFFile(c, slot++, GLS_ACTIVATION);
ClearTemporaryNewGRFData(); ClearTemporaryNewGRFData();
BuildCargoTranslationMap(); BuildCargoTranslationMap();
DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid); DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid);