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

Fix #10763, Fix #11168: Display variant groups that consist only of unavailable sub-groups (#11342)

pull/11351/head
merni-ns 2023-10-03 18:13:15 +05:30 committed by GitHub
parent 5869f790d8
commit c794676928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/autoreplace_gui.cpp
View File

@ -179,7 +179,13 @@ class ReplaceVehicleWindow : public Window {
if (side == 1 && eid == this->sel_engine[0]) flags |= EngineDisplayFlags::Shaded; if (side == 1 && eid == this->sel_engine[0]) flags |= EngineDisplayFlags::Shaded;
list.emplace_back(eid, e->info.variant_id, flags, 0); list.emplace_back(eid, e->info.variant_id, flags, 0);
if (side == 1 && e->info.variant_id != INVALID_ENGINE) variants.push_back(e->info.variant_id); if (side == 1) {
EngineID parent = e->info.variant_id;
while (parent != INVALID_ENGINE) {
variants.push_back(parent);
parent = Engine::Get(parent)->info.variant_id;
}
}
if (eid == this->sel_engine[side]) selected_engine = eid; // The selected engine is still in the list if (eid == this->sel_engine[side]) selected_engine = eid; // The selected engine is still in the list
} }

16
src/build_vehicle_gui.cpp
View File

@ -1422,7 +1422,14 @@ struct BuildVehicleWindow : Window {
list.emplace_back(eid, e->info.variant_id, e->display_flags, 0); list.emplace_back(eid, e->info.variant_id, e->display_flags, 0);
if (rvi->railveh_type != RAILVEH_WAGON) num_engines++; if (rvi->railveh_type != RAILVEH_WAGON) num_engines++;
if (e->info.variant_id != INVALID_ENGINE) variants.push_back(e->info.variant_id);
/* Add all parent variants of this engine to the variant list */
EngineID parent = e->info.variant_id;
while (parent != INVALID_ENGINE) {
variants.push_back(parent);
parent = Engine::Get(parent)->info.variant_id;
}
if (eid == this->sel_engine) sel_id = eid; if (eid == this->sel_engine) sel_id = eid;
} }
@ -1563,8 +1570,13 @@ struct BuildVehicleWindow : Window {
/* ensure primary engine of variant group is in list after filtering */ /* ensure primary engine of variant group is in list after filtering */
std::vector<EngineID> variants; std::vector<EngineID> variants;
for (const auto &item : this->eng_list) { for (const auto &item : this->eng_list) {
if (item.engine_id != item.variant_id && item.variant_id != INVALID_ENGINE) variants.push_back(item.variant_id); EngineID parent = item.variant_id;
while (parent != INVALID_ENGINE) {
variants.push_back(parent);
parent = Engine::Get(parent)->info.variant_id;
}
} }
for (const auto &variant : variants) { for (const auto &variant : variants) {
if (std::find(this->eng_list.begin(), this->eng_list.end(), variant) == this->eng_list.end()) { if (std::find(this->eng_list.begin(), this->eng_list.end(), variant) == this->eng_list.end()) {
const Engine *e = Engine::Get(variant); const Engine *e = Engine::Get(variant);