diff options
| -rw-r--r-- | src/industry.h | 2 | ||||
| -rw-r--r-- | src/industry_cmd.cpp | 11 | ||||
| -rw-r--r-- | src/newgrf_industries.cpp | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/industry.h b/src/industry.h index c9cb87b9f..c92c12041 100644 --- a/src/industry.h +++ b/src/industry.h @@ -212,7 +212,7 @@ struct IndustryTileSpec { /* industry_cmd.cpp*/ const IndustrySpec *GetIndustrySpec(IndustryType thistype); ///< Array of industries data -const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx, bool full_check = true); ///< Array of industry tiles data +const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx); ///< Array of industry tiles data void ResetIndustries(); void PlantRandomFarmField(const Industry *i); diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 07a3996f2..28732cf75 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -113,19 +113,13 @@ const IndustrySpec *GetIndustrySpec(IndustryType thistype) * This will ensure at once : proper access and * not allowing modifications of it. * @param gfx of industrytile (which is the index in _industry_tile_specs) - * @param full_check (default to true) verify if an override is available. - * If so, use it instead of the gfx provided. * @pre gfx < INVALID_INDUSTRYTILE * @return a pointer to the corresponding industrytile spec **/ -const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx, bool full_check) +const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx) { assert(gfx < INVALID_INDUSTRYTILE); - const IndustryTileSpec *its = &_industry_tile_specs[gfx]; - if (full_check && its->grf_prop.override != INVALID_INDUSTRYTILE) { - its = &_industry_tile_specs[its->grf_prop.override]; - } - return its; + return &_industry_tile_specs[gfx]; } Industry::~Industry() @@ -334,6 +328,7 @@ static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac) { IndustryGfx gfx = GetIndustryGfx(tile); const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx); + if (itspec->grf_prop.override != INVALID_INDUSTRYTILE) itspec = GetIndustryTileSpec(itspec->grf_prop.override); /* When we have to use a callback, we put our data in the next two variables */ CargoID raw_accepts_cargo[lengthof(itspec->accepts_cargo)]; diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 6f69fe1e7..ad0fdc2cb 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -87,8 +87,8 @@ uint32 GetIndustryIDAtOffset(TileIndex new_tile, TileIndex old_tile, const Indus if (GetIndustryIndex(new_tile) == i->index) { // Does it belong to the same industry? IndustryGfx gfx = GetIndustryGfx(new_tile); - const IndustryTileSpec *indtsp = GetIndustryTileSpec(gfx, false); - const IndustryTileSpec *indold = GetIndustryTileSpec(GetIndustryGfx(old_tile), false); + const IndustryTileSpec *indtsp = GetIndustryTileSpec(gfx); + const IndustryTileSpec *indold = GetIndustryTileSpec(GetIndustryGfx(old_tile)); if (gfx < NEW_INDUSTRYOFFSET) { // Does it belongs to an old type? /* It is an old tile. We have to see if it's been overriden */ |