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

Fix sort by total cargo in build ship window

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-02 01:48:28 +00:00
parent 3886ea75a6
commit 860af4de29
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/build_vehicle_gui.cpp
View File

@@ -532,11 +532,8 @@ static bool RoadVehEngineCapacityVsRunningCostSorter(const GUIEngineListItem &a,
*/ */
static bool ShipEngineCapacitySorter(const GUIEngineListItem &a, const GUIEngineListItem &b) static bool ShipEngineCapacitySorter(const GUIEngineListItem &a, const GUIEngineListItem &b)
{ {
const Engine *e_a = Engine::Get(a.engine_id); int va = GetTotalCapacityOfArticulatedParts(a.engine_id);
const Engine *e_b = Engine::Get(b.engine_id); int vb = GetTotalCapacityOfArticulatedParts(b.engine_id);
int va = e_a->GetDisplayDefaultCapacity();
int vb = e_b->GetDisplayDefaultCapacity();
int r = va - vb; int r = va - vb;
/* Use EngineID to sort instead since we want consistent sorting */ /* Use EngineID to sort instead since we want consistent sorting */
@@ -552,7 +549,7 @@ static bool ShipEngineCapacitySorter(const GUIEngineListItem &a, const GUIEngine
*/ */
static bool ShipEngineCapacityVsRunningCostSorter(const GUIEngineListItem &a, const GUIEngineListItem &b) static bool ShipEngineCapacityVsRunningCostSorter(const GUIEngineListItem &a, const GUIEngineListItem &b)
{ {
return GenericEngineValueVsRunningCostSorter(a, Engine::Get(a.engine_id)->GetDisplayDefaultCapacity(), b, Engine::Get(b.engine_id)->GetDisplayDefaultCapacity()); return GenericEngineValueVsRunningCostSorter(a, GetTotalCapacityOfArticulatedParts(a.engine_id), b, GetTotalCapacityOfArticulatedParts(b.engine_id));
} }
/* Aircraft sorting functions */ /* Aircraft sorting functions */