gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Don't produce invalid cargo. (#11314)

Browse Source 
Production for secondary industries did not always check that the produced cargo type isn't valid.
This commit is contained in:
PeterN 2023-09-18 22:43:03 +01:00 committed by GitHub
parent fd2dd4397f
commit 18e75dbc88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/economy.cpp
View File

@ -1169,9 +1169,10 @@ static void TriggerIndustryProduction(Industry *i)
} }
} else { } else {
for (auto ita = std::begin(i->accepted); ita != std::end(i->accepted); ++ita) { for (auto ita = std::begin(i->accepted); ita != std::end(i->accepted); ++ita) {
if (ita->waiting == 0) continue; if (ita->waiting == 0 || !IsValidCargoID(ita->cargo)) continue;
for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) { for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) {
if (!IsValidCargoID(itp->cargo)) continue;
itp->waiting = ClampTo<uint16_t>(itp->waiting + (ita->waiting * indspec->input_cargo_multiplier[ita - std::begin(i->accepted)][itp - std::begin(i->produced)] / 256)); itp->waiting = ClampTo<uint16_t>(itp->waiting + (ita->waiting * indspec->input_cargo_multiplier[ita - std::begin(i->accepted)][itp - std::begin(i->produced)] / 256));
} }

4
src/industry_cmd.cpp
View File

@ -1122,6 +1122,9 @@ static bool SearchLumberMillTrees(TileIndex tile, void *user_data)
*/ */
static void ChopLumberMillTrees(Industry *i) static void ChopLumberMillTrees(Industry *i)
{ {
/* Skip production if cargo slot is invalid. */
if (!IsValidCargoID(i->produced[0].cargo)) return;
/* We only want to cut trees if all tiles are completed. */ /* We only want to cut trees if all tiles are completed. */
for (TileIndex tile_cur : i->location) { for (TileIndex tile_cur : i->location) {
if (i->TileBelongsToIndustry(tile_cur)) { if (i->TileBelongsToIndustry(tile_cur)) {
@ -1160,6 +1163,7 @@ static void ProduceIndustryGoods(Industry *i)
IndustryBehaviour indbehav = indsp->behaviour; IndustryBehaviour indbehav = indsp->behaviour;
for (auto &p : i->produced) { for (auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue;
p.waiting = ClampTo<uint16_t>(p.waiting + p.rate); p.waiting = ClampTo<uint16_t>(p.waiting + p.rate);
} }

2
src/newgrf_industries.cpp
View File

@ -643,9 +643,11 @@ void IndustryProductionCallback(Industry *ind, int reason)
if (group->version < 2) { if (group->version < 2) {
/* Callback parameters map directly to industry cargo slot indices */ /* Callback parameters map directly to industry cargo slot indices */
for (uint i = 0; i < group->num_input; i++) { for (uint i = 0; i < group->num_input; i++) {
if (!IsValidCargoID(ind->accepted[i].cargo)) continue;
ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier); ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier);
} }
for (uint i = 0; i < group->num_output; i++) { for (uint i = 0; i < group->num_output; i++) {
if (!IsValidCargoID(ind->produced[i].cargo)) continue;
ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier); ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier);
} }
} else { } else {