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

Change: Move the filtered cargo to the first place in the industry directory window's cargo lists

pull/7906/head
stormcone 2019-11-23 21:52:33 +01:00 committed by Charles Pigott
parent 70f9c3c655
commit 808253c29c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/industry_gui.cpp
View File

@ -1475,6 +1475,18 @@ protected:
return std::get<3>(a) > std::get<3>(b); return std::get<3>(a) > std::get<3>(b);
}); });
/* If the produced cargo filter is active then move the filtered cargo to the beginning of the list,
* because this is the one the player interested in, and that way it is not hidden in the 'n' more cargos */
const CargoID cid = this->cargo_filter[this->produced_cargo_filter_criteria];
if (cid != CF_ANY && cid != CF_NONE) {
auto filtered_ci = std::find_if(cargos.begin(), cargos.end(), [cid](const CargoInfo& ci) -> bool {
return std::get<0>(ci) == cid;
});
if (filtered_ci != cargos.end()) {
std::rotate(cargos.begin(), filtered_ci, filtered_ci + 1);
}
}
/* Display first 3 cargos */ /* Display first 3 cargos */
for (size_t j = 0; j < min<size_t>(3, cargos.size()); j++) { for (size_t j = 0; j < min<size_t>(3, cargos.size()); j++) {
CargoInfo ci = cargos[j]; CargoInfo ci = cargos[j];