dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

27
src/economy.cpp
View File

@@ -973,7 +973,6 @@ static void FindSubsidyPassengerRoute(FoundRoute *fr)
static void FindSubsidyCargoRoute(FoundRoute *fr)
{
Industry *i;
const IndustrySpec *ind;
int trans, total;
CargoID cargo;
@@ -981,15 +980,14 @@ static void FindSubsidyCargoRoute(FoundRoute *fr)
fr->from = i = GetRandomIndustry();
if (i == NULL) return;
ind = GetIndustrySpec(i->type);
/* Randomize cargo type */
if (HASBIT(Random(), 0) && ind->produced_cargo[1] != CT_INVALID) {
cargo = ind->produced_cargo[1];
if (HASBIT(Random(), 0) && i->produced_cargo[1] != CT_INVALID) {
cargo = i->produced_cargo[1];
trans = i->last_month_pct_transported[1];
total = i->last_month_production[1];
} else {
cargo = ind->produced_cargo[0];
cargo = i->produced_cargo[0];
trans = i->last_month_pct_transported[0];
total = i->last_month_production[0];
}
@@ -1016,17 +1014,12 @@ static void FindSubsidyCargoRoute(FoundRoute *fr)
} else {
/* The destination is an industry */
Industry *i2 = GetRandomIndustry();
if (i2 == NULL) {
return;
}
ind = GetIndustrySpec(i2->type);
/* The industry must accept the cargo */
if (i == i2 ||
(cargo != ind->accepts_cargo[0] &&
cargo != ind->accepts_cargo[1] &&
cargo != ind->accepts_cargo[2])) {
if (i2 == NULL || i == i2 ||
(cargo != i2->accepts_cargo[0] &&
cargo != i2->accepts_cargo[1] &&
cargo != i2->accepts_cargo[2])) {
return;
}
fr->distance = DistanceManhattan(i->xy, i2->xy);
@@ -1227,12 +1220,12 @@ static void DeliverGoodsToIndustry(TileIndex xy, CargoID cargo_type, int num_pie
indspec = GetIndustrySpec(ind->type);
uint i;
for (i = 0; i < lengthof(indspec->accepts_cargo); i++) {
if (cargo_type == indspec->accepts_cargo[i]) break;
for (i = 0; i < lengthof(ind->accepts_cargo); i++) {
if (cargo_type == ind->accepts_cargo[i]) break;
}
/* Check if matching cargo has been found */
if (i == lengthof(indspec->accepts_cargo)) continue;
if (i == lengthof(ind->accepts_cargo)) continue;
if (HASBIT(indspec->callback_flags, CBM_IND_REFUSE_CARGO)) {
uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO, 0, GetReverseCargoTranslation(cargo_type, indspec->grf_prop.grffile), ind, ind->type, ind->xy);