Mercurial > hg > openttd

changeset 7660:e83a32e1cfce draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author glx <glx@openttd.org>
date Mon, 01 Oct 2007 18:59:25 +0000
parents 03747e97c53b
children 63e09fb99d1a
files src/newgrf.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -5495,7 +5495,7 @@
 	/* 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 @@
 			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);