cpp/openttd-patchpack/source Changeset - r21593:ef21383e536d

Changeset - r21593:ef21383e536d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 10 years ago 2014-08-09 19:32:51
alberth@openttd.org

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

1 file changed with 2 insertions and 2 deletions:

src/industry_gui.cpp

0 comments (0 inline, 0 general)

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -2002,7 +2002,7 @@ struct CargoesRow { @@
 					if (!hs->enabled) continue;
 					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);
 							goto next_cargo;
+						}
@@ @@ -2194,7 +2194,7 @@ struct IndustryCargoesWindow : public Wi @@
 				if (!hs->enabled || !(hs->building_availability & climate_mask)) continue;
 				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;
+				}
+			}
+		}

0 comments (0 inline, 0 general)