Mercurial > hg > openttd
changeset 2965:954bf474555f draft
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Fri, 03 Feb 2006 18:32:59 +0000 |
| parents | df5e8d9c79bd |
| children | c00093493c37 |
| files | lang/english.txt vehicle_gui.c |
| diffstat | 2 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lang/english.txt +++ b/lang/english.txt @@ -345,6 +345,8 @@ STR_SORT_BY_RELIABILITY :Reliability STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Total capacity per cargo type STR_SORT_BY_MAX_SPEED :Maximum speed +STR_SORT_BY_MODEL :Model +STR_SORT_BY_VALUE :Value ############ range for months starts STR_0162_JAN :Jan
--- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -42,6 +42,8 @@ static VehicleSortListingTypeFunction VehicleCargoSorter; static VehicleSortListingTypeFunction VehicleReliabilitySorter; static VehicleSortListingTypeFunction VehicleMaxSpeedSorter; +static VehicleSortListingTypeFunction VehicleModelSorter; +static VehicleSortListingTypeFunction VehicleValueSorter; static VehicleSortListingTypeFunction* const _vehicle_sorter[] = { &VehicleUnsortedSorter, @@ -52,7 +54,9 @@ &VehicleProfitLastYearSorter, &VehicleCargoSorter, &VehicleReliabilitySorter, - &VehicleMaxSpeedSorter + &VehicleMaxSpeedSorter, + &VehicleModelSorter, + &VehicleValueSorter, }; const StringID _vehicle_sort_listing[] = { @@ -65,6 +69,8 @@ STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE, STR_SORT_BY_RELIABILITY, STR_SORT_BY_MAX_SPEED, + STR_SORT_BY_MODEL, + STR_SORT_BY_VALUE, INVALID_STRING_ID }; @@ -408,6 +414,35 @@ return (_internal_sort_order & 1) ? -r : r; } +static int CDECL VehicleModelSorter(const void *a, const void *b) +{ + const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); + const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); + int r = va->engine_type - vb->engine_type; + + VEHICLEUNITNUMBERSORTER(r, va, vb); + + return (_internal_sort_order & 1) ? -r : r; +} + +static int CDECL VehicleValueSorter(const void *a, const void *b) +{ + const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); + const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); + const Vehicle *u; + int valuea = 0, valueb = 0; + int r; + + for (u = va; u != NULL; u = u->next) valuea += u->value; + for (u = vb; u != NULL; u = u->next) valueb += u->value; + + r = valuea - valueb; + + VEHICLEUNITNUMBERSORTER(r, va, vb); + + return (_internal_sort_order & 1) ? -r : r; +} + // this define is to match engine.c, but engine.c keeps it to itself // ENGINE_AVAILABLE is used in ReplaceVehicleWndProc #define ENGINE_AVAILABLE ((e->flags & 1 && HASBIT(info->climates, _opt.landscape)) || HASBIT(e->player_avail, _local_player))