cpp/openttd-patchpack/source File Diff

File diff r27420:b37b70eb3169 → r27421:e8c2cdc1e8e6

src/script/api/script_cargolist.cpp

➞

Show inline comments

@@ @@ -31,7 +31,7 @@ ScriptCargoList_IndustryAccepting::Scrip @@
 	Industry *ind = ::Industry::Get(industry_id);
 	for (uint i = 0; i < lengthof(ind->accepts_cargo); i++) {
 		CargoID cargo_id = ind->accepts_cargo[i];
-		if (cargo_id != CT_INVALID) {
+		if (::IsValidCargoID(cargo_id)) {
 			this->AddItem(cargo_id);
+		}
+	}
@@ @@ -44,7 +44,7 @@ ScriptCargoList_IndustryProducing::Scrip @@
 	Industry *ind = ::Industry::Get(industry_id);
 	for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
 		CargoID cargo_id = ind->produced_cargo[i];
-		if (cargo_id != CT_INVALID) {
+		if (::IsValidCargoID(cargo_id)) {
 			this->AddItem(cargo_id);
+		}
+	}