diff options
| author | frosch <frosch@openttd.org> | 2013-10-12 16:32:16 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-10-12 16:32:16 +0000 |
| commit | a521af8cf81eaca6791fd966e4ce9d240232bd12 (patch) | |
| tree | b72bbf47b7752e96adc243e512c61cb778bd34cf | |
| parent | ac599625da28a448a4f9ec655e4767e6436d0e16 (diff) | |
| download | openttd-a521af8cf81eaca6791fd966e4ce9d240232bd12.tar.xz | |
(svn r25836) -Codechange: Use NUM_INDUSTRYTYPES_PER_GRF instead of NUM_INDUSTRYTYPES to properly distinguish limits per NewGRF and limits of the pool.
| -rw-r--r-- | src/industry_type.h | 6 | ||||
| -rw-r--r-- | src/newgrf.cpp | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/industry_type.h b/src/industry_type.h index 34650d785..33119b57e 100644 --- a/src/industry_type.h +++ b/src/industry_type.h @@ -22,8 +22,10 @@ struct IndustryTileSpec; static const IndustryID INVALID_INDUSTRY = 0xFFFF; -static const IndustryType NEW_INDUSTRYOFFSET = 37; ///< original number of industries -static const IndustryType NUM_INDUSTRYTYPES = 64; ///< total number of industries, new and old +static const IndustryType NUM_INDUSTRYTYPES_PER_GRF = 64; ///< maximum number of industry types per NewGRF + +static const IndustryType NEW_INDUSTRYOFFSET = 37; ///< original number of industry types +static const IndustryType NUM_INDUSTRYTYPES = 64; ///< total number of industry types, new and old static const IndustryType INVALID_INDUSTRYTYPE = NUM_INDUSTRYTYPES; ///< one above amount is considered invalid static const IndustryGfx INDUSTRYTILE_NOANIM = 0xFF; ///< flag to mark industry tiles as having no animation diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 6a5e41330..4115d5f1b 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3215,14 +3215,14 @@ static ChangeInfoResult IndustriesChangeInfo(uint indid, int numinfo, int prop, { ChangeInfoResult ret = CIR_SUCCESS; - if (indid + numinfo > NUM_INDUSTRYTYPES) { - grfmsg(1, "IndustriesChangeInfo: Too many industries loaded (%u), max (%u). Ignoring.", indid + numinfo, NUM_INDUSTRYTYPES); + if (indid + numinfo > NUM_INDUSTRYTYPES_PER_GRF) { + grfmsg(1, "IndustriesChangeInfo: Too many industries loaded (%u), max (%u). Ignoring.", indid + numinfo, NUM_INDUSTRYTYPES_PER_GRF); return CIR_INVALID_ID; } /* Allocate industry specs if they haven't been allocated already. */ if (_cur.grffile->industryspec == NULL) { - _cur.grffile->industryspec = CallocT<IndustrySpec*>(NUM_INDUSTRYTYPES); + _cur.grffile->industryspec = CallocT<IndustrySpec*>(NUM_INDUSTRYTYPES_PER_GRF); } for (int i = 0; i < numinfo; i++) { @@ -7846,7 +7846,7 @@ static void ResetCustomIndustries() /* We are verifiying both tiles and industries specs loaded from the grf file * First, let's deal with industryspec */ if (industryspec != NULL) { - for (uint i = 0; i < NUM_INDUSTRYTYPES; i++) { + for (uint i = 0; i < NUM_INDUSTRYTYPES_PER_GRF; i++) { IndustrySpec *ind = industryspec[i]; if (ind == NULL) continue; @@ -8482,7 +8482,7 @@ static void FinaliseIndustriesArray() IndustrySpec **&industryspec = (*file)->industryspec; IndustryTileSpec **&indtspec = (*file)->indtspec; if (industryspec != NULL) { - for (int i = 0; i < NUM_INDUSTRYTYPES; i++) { + for (int i = 0; i < NUM_INDUSTRYTYPES_PER_GRF; i++) { IndustrySpec *indsp = industryspec[i]; if (indsp != NULL && indsp->enabled) { |