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

Add option to sort tracks by category and speed (#282)

Browse Source
This commit is contained in:
Andreas Schmitt
2021-06-17 18:07:18 +02:00
committed by Jonathan G Rennison
parent 24ad8759db
commit d718ba62ef
6 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/rail_cmd.cpp
View File

@@ -129,7 +129,57 @@ void ResolveRailTypeGUISprites(RailtypeInfo *rti)
*/
static bool CompareRailTypes(const RailType &first, const RailType &second)
{
return GetRailTypeInfo(first)->sorting_order < GetRailTypeInfo(second)->sorting_order;
if (_settings_client.gui.sort_track_types_by_speed) {
RailType rt[2] = { first, second };
uint sort_value[2];
for (int i = 0; i < 2; ++i) {
// Last sort by speed
sort_value[i] = (GetRailTypeInfo(rt[i])->max_speed != 0) ? GetRailTypeInfo(rt[i])->max_speed : UINT16_MAX;
// Inside those categories filter by compatibility with eachother.
if (!HasPowerOnRail(rt[i], rt[(i + 1) % 2])) {
sort_value[i] += (1 << 16);
}
// We sort by Rail, Electric and others
if (!HasPowerOnRail(rt[i], RAILTYPE_RAIL)) {
sort_value[i] += (1 << 17);
if (!HasPowerOnRail(rt[i], RAILTYPE_ELECTRIC)) {
sort_value[i] += (1 << 18);
if (!HasPowerOnRail(rt[i], RAILTYPE_MONO) && HasPowerOnRail(rt[i], RAILTYPE_MAGLEV)) {
sort_value[i] += (1 << 19);
}
}
}
// Then Mono
if (HasPowerOnRail(rt[i], RAILTYPE_MONO)) {
sort_value[i] += (1 << 20);
}
// Maglev is second last
if (HasPowerOnRail(rt[i], RAILTYPE_MAGLEV)) {
sort_value[i] += (1 << 21);
}
// All no-speed tracks (like planning and lifted) go to the end
if (GetRailTypeInfo(rt[i])->max_speed == 0) {
sort_value[i] += (1 << 22);
}
}
return sort_value[0] < sort_value[1];
} else {
return GetRailTypeInfo(first)->sorting_order < GetRailTypeInfo(second)->sorting_order;
}
}
void SortRailTypes()
{
std::sort(_sorted_railtypes.begin(), _sorted_railtypes.end(), CompareRailTypes);
}
/**
@@ -149,7 +199,7 @@ void InitRailTypes()
_sorted_railtypes.push_back(rt);
}
}
std::sort(_sorted_railtypes.begin(), _sorted_railtypes.end(), CompareRailTypes);
SortRailTypes();
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
_railtypes[rt].all_compatible_railtypes = _railtypes[rt].compatible_railtypes;