diff options
| author | frosch <frosch@openttd.org> | 2017-01-07 21:36:25 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2017-01-07 21:36:25 +0000 |
| commit | a3b356e05782f8b53ef2e3a645eccd33a8c87c23 (patch) | |
| tree | 0f02c58d9d835a6daa8d02b5457736dbc18c24a6 /src/newgrf.cpp | |
| parent | 4df712589c0786295238f5b915cb1c53939a94c2 (diff) | |
| download | openttd-a3b356e05782f8b53ef2e3a645eccd33a8c87c23.tar.xz | |
(svn r27725) -Codechange: Remove IsOpenTTDBaseGRF and test for GCF_CONFIG instead, which does the same in all use-cases.
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 8577cb40e..8d85b383d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5621,7 +5621,7 @@ static void GraphicsNew(ByteReader *buf) uint16 offset = HasBit(type, 7) ? buf->ReadExtendedByte() : 0; ClrBit(type, 7); // Clear the high bit as that only indicates whether there is an offset. - if ((type == 0x0D) && (num == 10) && _cur.grffile->is_ottdfile) { + if ((type == 0x0D) && (num == 10) && HasBit(_cur.grfconfig->flags, GCF_SYSTEM)) { /* Special not-TTDP-compatible case used in openttd.grf * Missing shore sprites and initialisation of SPR_SHORE_BASE */ grfmsg(2, "GraphicsNew: Loading 10 missing shore sprites from extra grf."); @@ -8858,7 +8858,6 @@ void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage, S if (_cur.grffile == NULL) usererror("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 = config->IsOpenTTDBaseGRF(); } if (file_index > LAST_GRF_SLOT) { |