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

Codechange: Use std::visit for SetupCargoForClimate. (#13103)

pull/13094/head
Peter Nelson 2024-11-19 20:30:16 +00:00 committed by GitHub
parent fc8685d618
commit fcac5479f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cargotype.cpp
View File

@ -72,21 +72,24 @@ void SetupCargoForClimate(LandscapeID l)
auto insert = std::begin(CargoSpec::array);
for (const auto &cl : _default_climate_cargo[l]) {
/* Check if value is an index into the cargo table */
if (std::holds_alternative<int>(cl)) {
/* Copy the default cargo by index. */
*insert = _default_cargo[std::get<int>(cl)];
} else {
/* Search for label in default cargo types and copy if found. */
CargoLabel label = std::get<CargoLabel>(cl);
auto found = std::find_if(std::begin(_default_cargo), std::end(_default_cargo), [&label](const CargoSpec &cs) { return cs.label == label; });
if (found != std::end(_default_cargo)) {
*insert = *found;
} else {
struct visitor {
const CargoSpec &operator()(const int &index)
{
/* Copy the default cargo by index. */
return _default_cargo[index];
}
const CargoSpec &operator()(const CargoLabel &label)
{
/* Search for label in default cargo types and copy if found. */
auto found = std::ranges::find(_default_cargo, label, &CargoSpec::label);
if (found != std::end(_default_cargo)) return *found;
/* Index or label is invalid, this should not happen. */
NOT_REACHED();
}
}
};
*insert = std::visit(visitor{}, cl);
if (insert->IsValid()) {
SetBit(_cargo_mask, insert->Index());