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

Fix cb23bc5e2a: Cargo types not initialised for house picker produced display. (#13624) 

Instead of using a CargoArray and passing to BuildCargoAcceptanceString, use the simpler CargoTypes with {CARGO_LIST}.
pull/13536/head
Peter Nelson 2025-02-19 19:01:03 +00:00 committed by GitHub
parent b8348d7e17
commit 2f8be54567
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@ -2859,7 +2859,7 @@ STR_HOUSE_PICKER_YEARS_FROM :{BLACK}Years: {
STR_HOUSE_PICKER_YEARS_UNTIL :{BLACK}Years: {ORANGE}Until {NUM} STR_HOUSE_PICKER_YEARS_UNTIL :{BLACK}Years: {ORANGE}Until {NUM}
STR_HOUSE_PICKER_SIZE :{BLACK}Size: {ORANGE}{NUM}x{NUM} tiles STR_HOUSE_PICKER_SIZE :{BLACK}Size: {ORANGE}{NUM}x{NUM} tiles
STR_HOUSE_PICKER_CARGO_ACCEPTED :{BLACK}Cargo accepted: {ORANGE} STR_HOUSE_PICKER_CARGO_ACCEPTED :{BLACK}Cargo accepted: {ORANGE}
STR_HOUSE_PICKER_CARGO_PRODUCED :{BLACK}Cargo produced: {ORANGE} STR_HOUSE_PICKER_CARGO_PRODUCED :{BLACK}Cargo produced: {ORANGE}{CARGO_LIST}
STR_HOUSE_PICKER_CLASS_ZONE1 :Edge STR_HOUSE_PICKER_CLASS_ZONE1 :Edge
STR_HOUSE_PICKER_CLASS_ZONE2 :Outskirts STR_HOUSE_PICKER_CLASS_ZONE2 :Outskirts

23
src/town_gui.cpp
View File

@ -1646,14 +1646,11 @@ public:
/** /**
* Get the cargo types produced by a house. * Get the cargo types produced by a house.
* @param hs HouseSpec of the house. * @param hs HouseSpec of the house.
* @returns CargoArray of cargo types produced by the house. * @returns Mask of cargo types produced by the house.
*/ */
static CargoArray GetProducedCargoOfHouse(const HouseSpec *hs) static CargoTypes GetProducedCargoOfHouse(const HouseSpec *hs)
{ {
/* We don't care how much cargo is produced, but BuildCargoAcceptanceString shows fractions when less then 8. */ CargoTypes produced{};
static const uint MIN_CARGO = 8;
CargoArray production;
if (hs->callback_mask.Test(HouseCallbackMask::ProduceCargo)) { if (hs->callback_mask.Test(HouseCallbackMask::ProduceCargo)) {
for (uint i = 0; i < 256; i++) { for (uint i = 0; i < 256; i++) {
uint16_t callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, 0, hs->Index(), nullptr, INVALID_TILE, true); uint16_t callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, 0, hs->Index(), nullptr, INVALID_TILE, true);
@ -1666,14 +1663,14 @@ static CargoArray GetProducedCargoOfHouse(const HouseSpec *hs)
uint amt = GB(callback, 0, 8); uint amt = GB(callback, 0, 8);
if (amt == 0) continue; if (amt == 0) continue;
production[cargo] = MIN_CARGO; SetBit(produced, cargo);
} }
} else { } else {
/* Cargo is not controlled by NewGRF, town production effect is used instead. */ /* Cargo is not controlled by NewGRF, town production effect is used instead. */
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TPE_PASSENGERS]) production[cs->Index()] = MIN_CARGO; for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TPE_PASSENGERS]) SetBit(produced, cs->Index());
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TPE_MAIL]) production[cs->Index()] = MIN_CARGO; for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TPE_MAIL]) SetBit(produced, cs->Index());
} }
return production; return produced;
} }
struct BuildHouseWindow : public PickerWindow { struct BuildHouseWindow : public PickerWindow {
@ -1756,10 +1753,10 @@ struct BuildHouseWindow : public PickerWindow {
line << *cargo_string; line << *cargo_string;
} }
cargo_string = BuildCargoAcceptanceString(GetProducedCargoOfHouse(hs), STR_HOUSE_PICKER_CARGO_PRODUCED); CargoTypes produced = GetProducedCargoOfHouse(hs);
if (cargo_string.has_value()) { if (produced != 0) {
line << "\n"; line << "\n";
line << *cargo_string; line << GetString(STR_HOUSE_PICKER_CARGO_PRODUCED, produced);
} }
return line.str(); return line.str();