diff options
| author | belugas <belugas@openttd.org> | 2008-01-04 15:39:08 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2008-01-04 15:39:08 +0000 |
| commit | 6b37ab36eaa10e70e222f468f11e1cdc2a52cb71 (patch) | |
| tree | c0603e4b8fbe7875779a3b1c3470af6071d8de98 | |
| parent | 1cd2c3d517912c6b9ec04d526fc252dd4de24a7a (diff) | |
| download | openttd-6b37ab36eaa10e70e222f468f11e1cdc2a52cb71.tar.xz | |
(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.
| -rw-r--r-- | src/newgrf.cpp | 6 | ||||
| -rw-r--r-- | src/newgrf.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index b47e9e788..1032a9747 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5532,7 +5532,7 @@ static void DecodeSpecialSprite(uint num, GrfLoadingStage stage) } -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, uint file_index, GrfLoadingStage stage, b 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 file_index) 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) { diff --git a/src/newgrf.h b/src/newgrf.h index 54b5c99c9..687d8aa3f 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -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 |