diff options
| author | glx <glx@openttd.org> | 2007-10-01 18:59:25 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-10-01 18:59:25 +0000 |
| commit | 729d121c502d1b5ab97235e4039d86de4dbf8603 (patch) | |
| tree | 615039535463991cef73cf2f70db07ba087f16ad | |
| parent | a2256f6b0f87eb8bca4c78b738613049efc8cd17 (diff) | |
| download | openttd-729d121c502d1b5ab97235e4039d86de4dbf8603.tar.xz | |
(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.
| -rw-r--r-- | src/newgrf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index ecf8b4973..76acc0990 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5495,7 +5495,7 @@ void LoadNewGRF(uint load_index, uint file_index) /* Load newgrf sprites * in each loading stage, (try to) open each file specified in the config * 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; _cur_stage = stage; @@ -5511,7 +5511,7 @@ void LoadNewGRF(uint load_index, uint file_index) LoadNewGRFFile(c, slot++, stage); if (stage == GLS_RESERVE) { if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED; - } else if (stage == GLS_ACTIVATION) { + LoadNewGRFFile(c, slot++, GLS_ACTIVATION); ClearTemporaryNewGRFData(); BuildCargoTranslationMap(); DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid); |