mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r10025) -Fix: [build windows] sorting planes for capacity didn't check mail capacity. Now mail capacity is used if passenger capacity is the same 

The sort will still resort to EngineID if both mail and passenger capacities are the same
This commit is contained in:
bjarni 2007-06-02 15:47:38 +00:00
parent 81698422a2
commit 532391db12
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/build_vehicle_gui.cpp
View File

@ -332,13 +332,20 @@ static int CDECL AircraftEngineRunningCostSorter(const void *a, const void *b)
static int CDECL AircraftEngineCargoSorter(const void *a, const void *b)
{
const int va = AircraftVehInfo(*(const EngineID*)a)->passenger_capacity;
const int vb = AircraftVehInfo(*(const EngineID*)b)->passenger_capacity;
const int r = va - vb;
int va = AircraftVehInfo(*(const EngineID*)a)->passenger_capacity;
int vb = AircraftVehInfo(*(const EngineID*)b)->passenger_capacity;
int r = va - vb;
if (r == 0) {
/* Use EngineID to sort instead since we want consistent sorting */
return EngineNumberSorter(a, b);
/* The planes has the same passenger capacity. Check mail capacity instead */
va = AircraftVehInfo(*(const EngineID*)a)->mail_capacity;
vb = AircraftVehInfo(*(const EngineID*)b)->mail_capacity;
r = va - vb;
if (r == 0) {
/* Use EngineID to sort instead since we want consistent sorting */
return EngineNumberSorter(a, b);
}
}
return _internal_sort_order ? -r : r;
}