gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r1016) Make the cargo sorter not consider the number of wagons of a particular cargo type but the sum of their capacity.

Browse Source 
Also add the number sorter to sort by vehicle number if the cargo capacity is equal.
This commit is contained in:
tron 2004-12-11 11:00:54 +00:00
parent 0ba5123cef
commit f995fd08a1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vehicle_gui.c
View File

@ -246,24 +246,21 @@ int CDECL VehicleProfitLastYearSorter(const void *a, const void *b)
int CDECL VehicleCargoSorter(const void *a, const void *b)
{
// FIXME - someone write a normal cargo sorter that also works by cargo_cap,
// FIXME - since I seem to be unable to do so :S
const Vehicle *va = DEREF_VEHICLE((*(const SortStruct*)a).index);
const Vehicle *vb = DEREF_VEHICLE((*(const SortStruct*)b).index);
const Vehicle *v;
int r = 0;
int i;
byte _cargo_counta[NUM_CARGO];
byte _cargo_countb[NUM_CARGO];
uint _cargo_counta[NUM_CARGO];
uint _cargo_countb[NUM_CARGO];
memset(_cargo_counta, 0, sizeof(_cargo_counta));
memset(_cargo_countb, 0, sizeof(_cargo_countb));
do {
_cargo_counta[va->cargo_type]++;
} while ( (va = va->next) != NULL);
for (v = va; v != NULL; v = v->next)
_cargo_counta[v->cargo_type] += v->cargo_cap;
do {
_cargo_countb[vb->cargo_type]++;
} while ( (vb = vb->next) != NULL);
for (v = vb; v != NULL; v = v->next)
_cargo_countb[v->cargo_type] += v->cargo_cap;
for (i = 0; i < NUM_CARGO; i++) {
r = _cargo_counta[i] - _cargo_countb[i];
@ -271,6 +268,8 @@ int CDECL VehicleCargoSorter(const void *a, const void *b)
break;
}
VEHICLEUNITNUMBERSORTER(r, va, vb);
return (_internal_sort_order & 1) ? -r : r;
}