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

(svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses.

release/1.5
alberth 2014-08-09 19:32:51 +00:00
parent 258e510141
commit be4bbf7dd9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_gui.cpp
View File

@ -2002,7 +2002,7 @@ struct CargoesRow {
if (!hs->enabled) continue; if (!hs->enabled) continue;
for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) { for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) {
if (cargo_fld->u.cargo.vertical_cargoes[i] == hs->accepts_cargo[j]) { if (hs->cargo_acceptance[j] > 0 && cargo_fld->u.cargo.vertical_cargoes[i] == hs->accepts_cargo[j]) {
cargo_fld->ConnectCargo(cargo_fld->u.cargo.vertical_cargoes[i], false); cargo_fld->ConnectCargo(cargo_fld->u.cargo.vertical_cargoes[i], false);
goto next_cargo; goto next_cargo;
} }
@ -2194,7 +2194,7 @@ struct IndustryCargoesWindow : public Window {
if (!hs->enabled || !(hs->building_availability & climate_mask)) continue; if (!hs->enabled || !(hs->building_availability & climate_mask)) continue;
for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) { for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) {
if (cargoes[i] == hs->accepts_cargo[j]) return true; if (hs->cargo_acceptance[j] > 0 && cargoes[i] == hs->accepts_cargo[j]) return true;
} }
} }
} }