gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add: Show cargo types produced by building in house picker. (#13561)

Browse Source
This commit is contained in:
Peter Nelson 2025-02-15 15:06:58 +00:00 committed by GitHub
parent 04708736d9
commit cb23bc5e2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

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

45
src/town_gui.cpp
View File

@ -1626,6 +1626,39 @@ public:
};
/* static */ HousePickerCallbacks HousePickerCallbacks::instance;
/**
* Get the cargo types produced by a house.
* @param hs HouseSpec of the house.
* @returns CargoArray of cargo types produced by the house.
*/
static CargoArray GetProducedCargoOfHouse(const HouseSpec *hs)
{
/* We don't care how much cargo is produced, but BuildCargoAcceptanceString shows fractions when less then 8. */
static const uint MIN_CARGO = 8;
CargoArray production;
if (hs->callback_mask.Test(HouseCallbackMask::ProduceCargo)) {
for (uint i = 0; i < 256; i++) {
uint16_t callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, 0, hs->Index(), nullptr, INVALID_TILE, true);
if (callback == CALLBACK_FAILED || callback == CALLBACK_HOUSEPRODCARGO_END) break;
CargoType cargo = GetCargoTranslation(GB(callback, 8, 7), hs->grf_prop.grffile);
if (!IsValidCargoType(cargo)) continue;
uint amt = GB(callback, 0, 8);
if (amt == 0) continue;
production[cargo] = MIN_CARGO;
}
} else {
/* 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_MAIL]) production[cs->Index()] = MIN_CARGO;
}
return production;
}
struct BuildHouseWindow : public PickerWindow {
std::string house_info;
bool house_protected;
@ -1699,10 +1732,18 @@ struct BuildHouseWindow : public PickerWindow {
if (hs->building_flags.Test(BuildingFlag::Size1x2)) size = 0x12;
if (hs->building_flags.Test(BuildingFlag::Size2x2)) size = 0x22;
line << GetString(STR_HOUSE_PICKER_SIZE, GB(size, 0, 4), GB(size, 4, 4));
line << "\n";
auto cargo_string = BuildCargoAcceptanceString(GetAcceptedCargoOfHouse(hs), STR_HOUSE_PICKER_CARGO_ACCEPTED);
if (cargo_string.has_value()) line << *cargo_string;
if (cargo_string.has_value()) {
line << "\n";
line << *cargo_string;
}
cargo_string = BuildCargoAcceptanceString(GetProducedCargoOfHouse(hs), STR_HOUSE_PICKER_CARGO_PRODUCED);
if (cargo_string.has_value()) {
line << "\n";
line << *cargo_string;
}
return line.str();
}