mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12933) -Fix: minor errors related to industries accepted/produced cargo

release/0.7
glx 2008-05-01 22:51:53 +00:00
parent 3e0b6199c4
commit 49484eedca
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/industry_cmd.cpp
View File

@ -1391,7 +1391,7 @@ static bool CheckIfFarEnoughFromIndustry(TileIndex tile, int type)
const IndustrySpec *indspec = GetIndustrySpec(type); const IndustrySpec *indspec = GetIndustrySpec(type);
const Industry *i; const Industry *i;
if (_patches.same_industry_close && indspec->accepts_cargo[0] == CT_INVALID) if (_patches.same_industry_close && indspec->IsRawIndustry())
/* Allow primary industries to be placed close to any other industry */ /* Allow primary industries to be placed close to any other industry */
return true; return true;
@ -1401,7 +1401,7 @@ static bool CheckIfFarEnoughFromIndustry(TileIndex tile, int type)
/* check if an industry that accepts the same goods is nearby */ /* check if an industry that accepts the same goods is nearby */
if (in_low_distance && if (in_low_distance &&
indspec->accepts_cargo[0] != CT_INVALID && // not a primary industry? !indspec->IsRawIndustry() && // not a primary industry?
indspec->accepts_cargo[0] == i->accepts_cargo[0] && ( indspec->accepts_cargo[0] == i->accepts_cargo[0] && (
/* at least one of those options must be true */ /* at least one of those options must be true */
_game_mode != GM_EDITOR || // editor must not be stopped _game_mode != GM_EDITOR || // editor must not be stopped
@ -1904,7 +1904,8 @@ static void CanCargoServiceIndustry(CargoID cargo, Industry *ind, bool *c_accept
const IndustrySpec *indspec = GetIndustrySpec(ind->type); const IndustrySpec *indspec = GetIndustrySpec(ind->type);
/* Check for acceptance of cargo */ /* Check for acceptance of cargo */
for (uint j = 0; j < lengthof(ind->accepts_cargo) && ind->accepts_cargo[j] != CT_INVALID; j++) { for (byte j = 0; j < lengthof(ind->accepts_cargo); j++) {
if (ind->accepts_cargo[j] == CT_INVALID) continue;
if (cargo == ind->accepts_cargo[j]) { if (cargo == ind->accepts_cargo[j]) {
if (HasBit(indspec->callback_flags, CBM_IND_REFUSE_CARGO)) { if (HasBit(indspec->callback_flags, CBM_IND_REFUSE_CARGO)) {
uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO, uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO,
@ -1918,7 +1919,8 @@ static void CanCargoServiceIndustry(CargoID cargo, Industry *ind, bool *c_accept
} }
/* Check for produced cargo */ /* Check for produced cargo */
for (uint j = 0; j < lengthof(ind->produced_cargo) && ind->produced_cargo[j] != CT_INVALID; j++) { for (byte j = 0; j < lengthof(ind->produced_cargo); j++) {
if (ind->produced_cargo[j] == CT_INVALID) continue;
if (cargo == ind->produced_cargo[j]) { if (cargo == ind->produced_cargo[j]) {
*c_produces = true; *c_produces = true;
break; break;
@ -2080,7 +2082,8 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
if (smooth_economy) { if (smooth_economy) {
closeit = true; closeit = true;
for (byte j = 0; j < 2 && i->produced_cargo[j] != CT_INVALID; j++){ for (byte j = 0; j < lengthof(i->produced_cargo); j++) {
if (i->produced_cargo[j] == CT_INVALID) continue;
uint32 r = Random(); uint32 r = Random();
int old_prod, new_prod, percent; int old_prod, new_prod, percent;
/* If over 60% is transported, mult is 1, else mult is -1. */ /* If over 60% is transported, mult is 1, else mult is -1. */