petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C

Browse Source
This commit is contained in:
glx
2007-09-27 21:39:13 +00:00
parent 02d23c2776
commit 5e45e73037
10 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/station_cmd.cpp
View File

@@ -165,14 +165,14 @@ static bool CMSAMine(TileIndex tile)
/* No industry */
if (!IsTileType(tile, MP_INDUSTRY)) return false;
const IndustrySpec *indsp = GetIndustrySpec(GetIndustryByTile(tile)->type);
const Industry *ind = GetIndustryByTile(tile);
/* No extractive industry */
if ((indsp->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false;
if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false;
for (uint i = 0; i < lengthof(indsp->produced_cargo); i++) {
for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
/* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine */
if (indsp->produced_cargo[i] != CT_INVALID && (GetCargo(indsp->produced_cargo[i])->classes & CC_LIQUID) == 0) return true;
if (ind->produced_cargo[i] != CT_INVALID && (GetCargo(ind->produced_cargo[i])->classes & CC_LIQUID) == 0) return true;
}
return false;
@@ -208,14 +208,14 @@ static bool CMSAForest(TileIndex tile)
/* No industry */
if (!IsTileType(tile, MP_INDUSTRY)) return false;
const IndustrySpec *indsp = GetIndustrySpec(GetIndustryByTile(tile)->type);
const Industry *ind = GetIndustryByTile(tile);
/* No extractive industry */
if ((indsp->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
for (uint i = 0; i < lengthof(indsp->produced_cargo); i++) {
for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
/* The industry produces wood. */
if (indsp->produced_cargo[i] != CT_INVALID && GetCargo(indsp->produced_cargo[i])->label == 'WOOD') return true;
if (ind->produced_cargo[i] != CT_INVALID && GetCargo(ind->produced_cargo[i])->label == 'WOOD') return true;
}
return false;