cpp/openttd-patchpack/source Changeset - r8194:f77e3d1d7cb3

Changeset - r8194:f77e3d1d7cb3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 16 years ago 2008-01-04 15:39:08
belugas@openttd.org

(svn r11757) -Fix(r11727): Don't use a function's default parameter when the value can be (more adequately, even better) computed from another source.
Thanks peter1138.

2 files changed with 4 insertions and 4 deletions:

src/newgrf.cpp

src/newgrf.h

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -5532,7 +5532,7 @@ static void DecodeSpecialSprite(uint num @@
+}
-void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage, bool ottd_grf)
 void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
+{
 	const char *filename = config->filename;
 	uint16 num;
@@ @@ -5551,7 +5551,7 @@ void LoadNewGRFFile(GRFConfig *config, u @@
 		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 && !HasBit(config->flags, GCF_RESERVED)) return;
-		_cur_grffile->is_ottdfile = ottd_grf;
+		_cur_grffile->is_ottdfile = config->IsOpenTTDBaseGRF();
+	}
 	if (file_index > LAST_GRF_SLOT) {
@@ @@ -5694,7 +5694,7 @@ void LoadNewGRF(uint load_index, uint fi @@
 			if (!FioCheckFileExists(c->filename)) error("NewGRF file is missing '%s'", c->filename);
 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
-			LoadNewGRFFile(c, slot++, stage, true);
 			LoadNewGRFFile(c, slot++, stage);
 			if (stage == GLS_RESERVE) {
 				SetBit(c->flags, GCF_RESERVED);
 			} else if (stage == GLS_ACTIVATION) {

src/newgrf.h

➞

Show inline comments

@@ @@ -94,7 +94,7 @@ struct GRFLoadedFeatures { @@
 /* Indicates which are the newgrf features currently loaded ingame */
 extern GRFLoadedFeatures _loaded_newgrf_features;
-void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage, bool ottd_grf = false);
 void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage);
 void LoadNewGRF(uint load_index, uint file_index);
 void ReloadNewGRFData(); // in openttd.cpp

0 comments (0 inline, 0 general)