dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix filtering by cargo type = none in vehicle list

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-10-16 19:44:37 +01:00
parent b1613a24f0
commit d4de9de61d
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/group_gui.cpp
View File

@@ -108,15 +108,25 @@ static const NWidgetPart _nested_group_widgets[] = {
static const CargoID CF_ANY = CT_NO_REFIT; ///< Show all vehicles independent of carried cargo (i.e. no filtering) static const CargoID CF_ANY = CT_NO_REFIT; ///< Show all vehicles independent of carried cargo (i.e. no filtering)
static const CargoID CF_NONE = CT_INVALID; ///< Show only vehicles which do not carry cargo (e.g. train engines) static const CargoID CF_NONE = CT_INVALID; ///< Show only vehicles which do not carry cargo (e.g. train engines)
/** Cargo filter functions */ /** Cargo filter functions */
static bool CDECL CargoFilter(const Vehicle *const*vid, const CargoID cid) static bool CDECL CargoFilter(const Vehicle * const *vid, const CargoID cid)
{ {
if (cid == CF_ANY) return true; if (cid == CF_ANY) {
for (const Vehicle *w = (*vid); w != NULL; w = w->Next()) { return true;
if (w->cargo_cap > 0 && w->cargo_type == cid) { } else if (cid == CF_NONE) {
return true; for (const Vehicle *w = (*vid); w != NULL; w = w->Next()) {
if (w->cargo_cap > 0) {
return false;
}
} }
return true;
} else {
for (const Vehicle *w = (*vid); w != NULL; w = w->Next()) {
if (w->cargo_cap > 0 && w->cargo_type == cid) {
return true;
}
}
return false;
} }
return false;
} }
static GUIVehicleList::FilterFunction * const _filter_funcs[] = { static GUIVehicleList::FilterFunction * const _filter_funcs[] = {