cpp/openttd-patchpack/source Changeset - r6820:a1777c22c53a

Changeset - r6820:a1777c22c53a

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 17 years ago 2007-06-07 18:13:31
peter1138@openttd.org

(svn r10059) -Fix (r10045): Pretend GRF is still in initialisation state when leaving reservation stage. This fixes action 7/9 tests for grfs that will be active.

1 file changed with 4 insertions and 2 deletions:

src/newgrf.cpp

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -4830,7 +4830,7 @@ void LoadNewGRFFile(GRFConfig *config, u @@
 		_cur_grffile = GetFileByFilename(filename);
 		if (_cur_grffile == NULL) error("File '%s' lost in cache.\n", filename);
 		if (stage == GLS_RESERVE && config->status != GCS_INITIALISED) return;
-		if (stage == GLS_ACTIVATION && config->status != GCS_ACTIVATED) return;
+		if (stage == GLS_ACTIVATION && config->status != GCS_INITIALISED) return;
+	}
 	FioOpenFile(file_index, filename);
@@ @@ -4945,7 +4945,9 @@ void LoadNewGRF(uint load_index, uint fi @@
 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
 			LoadNewGRFFile(c, slot++, stage);
 			if (stage == GLS_ACTIVATION) {
 			if (stage == GLS_RESERVE) {
 				if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
 			} else if (stage == GLS_ACTIVATION) {
 				ClearTemporaryNewGRFData();
 				BuildCargoTranslationMap();
 				DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid);

0 comments (0 inline, 0 general)