cpp/openttd-patchpack/source Changeset - r12707:8316c73753e1

Changeset - r12707:8316c73753e1

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-08-15 10:51:33
rubidium@openttd.org

(svn r17182) -Feature(ish) [FS#2945]: sort vehicle lists on (timetable) delay

2 files changed with 11 insertions and 0 deletions:

src/lang/english.txt

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -259,6 +259,7 @@ STR_SORT_BY_MODEL @@
 STR_SORT_BY_VALUE                                               :Value
 STR_SORT_BY_LENGTH                                              :Length
 STR_SORT_BY_LIFE_TIME                                           :Remaining life time
 STR_SORT_BY_TIMETABLE_DELAY                                     :Timetable delay
 STR_SORT_BY_FACILITY                                            :Station type
 STR_SORT_BY_WAITING                                             :Waiting cargo value
 STR_SORT_BY_RATING_MAX                                          :Highest cargo rating

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -51,6 +51,7 @@ static GUIVehicleList::SortFunction Vehi @@
 static GUIVehicleList::SortFunction VehicleValueSorter;
 static GUIVehicleList::SortFunction VehicleLengthSorter;
 static GUIVehicleList::SortFunction VehicleTimeToLiveSorter;
 static GUIVehicleList::SortFunction VehicleTimetableDelaySorter;
 GUIVehicleList::SortFunction * const BaseVehicleListWindow::vehicle_sorter_funcs[] = {
 	&VehicleNumberSorter,
@@ @@ -65,6 +66,7 @@ GUIVehicleList::SortFunction * const Bas @@
 	&VehicleValueSorter,
 	&VehicleLengthSorter,
 	&VehicleTimeToLiveSorter,
 	&VehicleTimetableDelaySorter,
 };
 const StringID BaseVehicleListWindow::vehicle_sorter_names[] = {
@@ @@ -80,6 +82,7 @@ const StringID BaseVehicleListWindow::ve @@
 	STR_SORT_BY_VALUE,
 	STR_SORT_BY_LENGTH,
 	STR_SORT_BY_LIFE_TIME,
 	STR_SORT_BY_TIMETABLE_DELAY,
 	INVALID_STRING_ID
 };
@@ @@ -626,6 +629,13 @@ static int CDECL VehicleTimeToLiveSorter @@
 	return (r != 0) ? r : VehicleNumberSorter(a, b);
+}
 /** Sort vehicles by the timetable delay */
 static int CDECL VehicleTimetableDelaySorter(const Vehicle * const *a, const Vehicle * const *b)
+{
 	int r = (*a)->lateness_counter - (*b)->lateness_counter;
 	return (r != 0) ? r : VehicleNumberSorter(a, b);
+}
 void InitializeGUI()
+{
 	MemSetT(&_sorting, 0);

0 comments (0 inline, 0 general)