equal
deleted
inserted
replaced
42 #include "industry.h" |
42 #include "industry.h" |
43 #include "newgrf_canal.h" |
43 #include "newgrf_canal.h" |
44 #include "table/build_industry.h" |
44 #include "table/build_industry.h" |
45 #include "newgrf_commons.h" |
45 #include "newgrf_commons.h" |
46 #include "newgrf_townname.h" |
46 #include "newgrf_townname.h" |
|
47 #include "newgrf_industries.h" |
47 |
48 |
48 /* TTDPatch extended GRF format codec |
49 /* TTDPatch extended GRF format codec |
49 * (c) Petr Baudis 2004 (GPL'd) |
50 * (c) Petr Baudis 2004 (GPL'd) |
50 * Changes by Florian octo Forster are (c) by the OpenTTD development team. |
51 * Changes by Florian octo Forster are (c) by the OpenTTD development team. |
51 * |
52 * |
5223 for (int i = 0; i < NUM_INDUSTRYTILES; i++) { |
5224 for (int i = 0; i < NUM_INDUSTRYTILES; i++) { |
5224 IndustryTileSpec *indtsp = file->indtspec[i]; |
5225 IndustryTileSpec *indtsp = file->indtspec[i]; |
5225 if (indtsp != NULL) { |
5226 if (indtsp != NULL) { |
5226 _industile_mngr.SetEntitySpec(indtsp); |
5227 _industile_mngr.SetEntitySpec(indtsp); |
5227 } |
5228 } |
|
5229 } |
|
5230 } |
|
5231 } |
|
5232 |
|
5233 for (uint j = 0; j < NUM_INDUSTRYTYPES; j++) { |
|
5234 IndustrySpec *indsp = &_industry_specs[j]; |
|
5235 if (indsp->enabled && indsp->grf_prop.grffile != NULL) { |
|
5236 for (uint i = 0; i < 3; i++) { |
|
5237 indsp->conflicting[i] = MapNewGRFIndustryType(indsp->conflicting[i], indsp->grf_prop.grffile->grfid); |
5228 } |
5238 } |
5229 } |
5239 } |
5230 } |
5240 } |
5231 } |
5241 } |
5232 |
5242 |