mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-30 09:59:10 +00:00
(svn r6270) Remove the "unsorted" vehicle sorter, because it's plain useless
This commit is contained in:
tron
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Name
|
||||
STR_SORT_BY_DROPDOWN_NAME :Name
|
||||
STR_SORT_BY_DATE :{BLACK}Date
|
||||
STR_SORT_BY_UNSORTED :Unsorted
|
||||
STR_SORT_BY_NUMBER :Number
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit last year
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit this year
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nome
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nome
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Sem classificar
|
||||
STR_SORT_BY_NUMBER :N<>mero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Lucros do <20>ltimo ano
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Lucros deste ano
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nom
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nom
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Sense ordre
|
||||
STR_SORT_BY_NUMBER :N<>mero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Benef. darrer any
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Benef. aquest any
|
||||
|
||||
@@ -426,7 +426,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Preprave
|
||||
STR_SORT_BY_NAME :{BLACK}Podle jm<6A>na
|
||||
STR_SORT_BY_DROPDOWN_NAME :jm<6A>na
|
||||
STR_SORT_BY_DATE :{BLACK}Podle data
|
||||
STR_SORT_BY_UNSORTED :(neradit)
|
||||
STR_SORT_BY_NUMBER :cisla
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :hrub<75>ho zisku vloni
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :hrub<75>ho zisku letos
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Navn
|
||||
STR_SORT_BY_DROPDOWN_NAME :Navn
|
||||
STR_SORT_BY_DATE :{BLACK}Dato
|
||||
STR_SORT_BY_UNSORTED :Usorteret
|
||||
STR_SORT_BY_NUMBER :Nummer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit sidste <20>r
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit dette <20>r
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Vervoerd
|
||||
STR_SORT_BY_NAME :{BLACK}Naam
|
||||
STR_SORT_BY_DROPDOWN_NAME :Naam
|
||||
STR_SORT_BY_DATE :{BLACK}Datum
|
||||
STR_SORT_BY_UNSORTED :Ongesorteerd
|
||||
STR_SORT_BY_NUMBER :Nummer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Winst vorig jaar
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Winst dit jaar
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Name
|
||||
STR_SORT_BY_DROPDOWN_NAME :Name
|
||||
STR_SORT_BY_DATE :{BLACK}Date
|
||||
STR_SORT_BY_UNSORTED :Unsorted
|
||||
STR_SORT_BY_NUMBER :Number
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit last year
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit this year
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nimi
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nimi
|
||||
STR_SORT_BY_DATE :{BLACK}Kuup<75>ev
|
||||
STR_SORT_BY_UNSORTED :Sorteerimata
|
||||
STR_SORT_BY_NUMBER :Number
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Eelmise aasta kasum
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Selle aasta kasum
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Kuljetet
|
||||
STR_SORT_BY_NAME :{BLACK}Nimi
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nimi
|
||||
STR_SORT_BY_DATE :{BLACK}P<>iv<69>ys
|
||||
STR_SORT_BY_UNSORTED :Ei lajittelua
|
||||
STR_SORT_BY_NUMBER :Numero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Tuottoa viime vuonna
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Tuottoa t<>n<EFBFBD> vuonna
|
||||
|
||||
@@ -370,7 +370,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nom
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nom
|
||||
STR_SORT_BY_DATE :{BLACK}Date
|
||||
STR_SORT_BY_UNSORTED :Non tri<72>
|
||||
STR_SORT_BY_NUMBER :Num<75>ro
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit l'an dernier
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit cette ann<6E>e
|
||||
|
||||
@@ -366,7 +366,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nome
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nome
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Sen ordear
|
||||
STR_SORT_BY_NUMBER :N<>mero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Beneficio <20>ltimo ano
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Beneficio este ano
|
||||
|
||||
@@ -370,7 +370,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Name
|
||||
STR_SORT_BY_DROPDOWN_NAME :Name
|
||||
STR_SORT_BY_DATE :{BLACK}Datum
|
||||
STR_SORT_BY_UNSORTED :Unsortiert
|
||||
STR_SORT_BY_NUMBER :Nummer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit letztes Jahr
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit dieses Jahr
|
||||
|
||||
@@ -434,7 +434,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Elsz
|
||||
STR_SORT_BY_NAME :{BLACK}N<>v
|
||||
STR_SORT_BY_DROPDOWN_NAME :N<>v
|
||||
STR_SORT_BY_DATE :{BLACK}D<>tum
|
||||
STR_SORT_BY_UNSORTED :Rendezetlen
|
||||
STR_SORT_BY_NUMBER :Sz<53>m
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Tavalyi profit
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Idei profit
|
||||
|
||||
@@ -370,7 +370,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Flutt
|
||||
STR_SORT_BY_NAME :{BLACK}Nafn
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nafn
|
||||
STR_SORT_BY_DATE :{BLACK}Dagsetning
|
||||
STR_SORT_BY_UNSORTED :<3A>flokka<6B>
|
||||
STR_SORT_BY_NUMBER :N<>mer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Hagna<6E>ur s<><73>asta <20>rs
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Hagna<6E>ur <20>essa <20>rs
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Trasport
|
||||
STR_SORT_BY_NAME :{BLACK}Nome
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nome
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Nessun ordine
|
||||
STR_SORT_BY_NUMBER :Numero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profitto dell'anno scorso
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profitto di quest'anno
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Navn
|
||||
STR_SORT_BY_DROPDOWN_NAME :Navn
|
||||
STR_SORT_BY_DATE :{BLACK}Dato
|
||||
STR_SORT_BY_UNSORTED :Usortert
|
||||
STR_SORT_BY_NUMBER :Nummer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Fortjeneste forrige <20>r
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Fortjeneste innev<65>rende <20>r
|
||||
|
||||
@@ -422,7 +422,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Przetran
|
||||
STR_SORT_BY_NAME :{BLACK}Nazwa
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nazwa
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Nieposortowane
|
||||
STR_SORT_BY_NUMBER :Numer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Zysk w ostatnim roku
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Zysk w tym roku
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nome
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nome
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :N<>o ordenado
|
||||
STR_SORT_BY_NUMBER :N<>mero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Lucros do <20>ltimo ano
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Lucros deste ano
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nume
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nume
|
||||
STR_SORT_BY_DATE :{BLACK}Dat<61>
|
||||
STR_SORT_BY_UNSORTED :Neordonat
|
||||
STR_SORT_BY_NUMBER :Numar
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit anul trecut
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit anul acesta
|
||||
|
||||
@@ -433,7 +433,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Preprave
|
||||
STR_SORT_BY_NAME :{BLACK}Nazov
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nazov
|
||||
STR_SORT_BY_DATE :{BLACK}Datum
|
||||
STR_SORT_BY_UNSORTED :Neusporiadane
|
||||
STR_SORT_BY_NUMBER :Cislo
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Zisk v poslednom roku
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Zisk v tomto roku
|
||||
|
||||
@@ -370,7 +370,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Nombre
|
||||
STR_SORT_BY_DROPDOWN_NAME :Nombre
|
||||
STR_SORT_BY_DATE :{BLACK}Fecha
|
||||
STR_SORT_BY_UNSORTED :Sin ordenar
|
||||
STR_SORT_BY_NUMBER :N<>mero
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Beneficio a<>o pasado
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Beneficio a<>o actual
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Namn
|
||||
STR_SORT_BY_DROPDOWN_NAME :Namn
|
||||
STR_SORT_BY_DATE :{BLACK}Datum
|
||||
STR_SORT_BY_UNSORTED :Osorterat
|
||||
STR_SORT_BY_NUMBER :Nummer
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Vinst f<>rra <20>ret
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Vinst i <20>r
|
||||
|
||||
@@ -369,7 +369,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Tasinan
|
||||
STR_SORT_BY_NAME :{BLACK}isim
|
||||
STR_SORT_BY_DROPDOWN_NAME :isim
|
||||
STR_SORT_BY_DATE :{BLACK}Tarih
|
||||
STR_SORT_BY_UNSORTED :Siralanmamis
|
||||
STR_SORT_BY_NUMBER :Numara
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Ge<47>en seneki kar
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Bu seneki kar
|
||||
|
||||
@@ -337,7 +337,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Transpor
|
||||
STR_SORT_BY_NAME :{BLACK}Va'rda
|
||||
STR_SORT_BY_DROPDOWN_NAME :Va'rds
|
||||
STR_SORT_BY_DATE :{BLACK}Datums
|
||||
STR_SORT_BY_UNSORTED :Nesaka'rtots
|
||||
STR_SORT_BY_NUMBER :Nummurs
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Paga'jus'a' gada iena'kums
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :S'i' gada iena'kums
|
||||
|
||||
@@ -358,7 +358,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Pervezim
|
||||
STR_SORT_BY_NAME :{BLACK}Varda
|
||||
STR_SORT_BY_DROPDOWN_NAME :Varda
|
||||
STR_SORT_BY_DATE :{BLACK}Data
|
||||
STR_SORT_BY_UNSORTED :Nerikiuota
|
||||
STR_SORT_BY_NUMBER :Kieki
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Praeitu metu pelna
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Siu metu pelna
|
||||
|
||||
@@ -363,7 +363,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}Prenesen
|
||||
STR_SORT_BY_NAME :{BLACK}Ime
|
||||
STR_SORT_BY_DROPDOWN_NAME :Ime
|
||||
STR_SORT_BY_DATE :{BLACK}Datum
|
||||
STR_SORT_BY_UNSORTED :Nesortirano
|
||||
STR_SORT_BY_NUMBER :Stevilo
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :Profit zadnje leto
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :Profit to leto
|
||||
|
||||
@@ -370,7 +370,6 @@ STR_SORT_BY_TRANSPORTED :{BLACK}за п
|
||||
STR_SORT_BY_NAME :{BLACK}за назвою
|
||||
STR_SORT_BY_DROPDOWN_NAME :Назва
|
||||
STR_SORT_BY_DATE :{BLACK}за датою
|
||||
STR_SORT_BY_UNSORTED :не треба
|
||||
STR_SORT_BY_NUMBER :за номером
|
||||
STR_SORT_BY_PROFIT_LAST_YEAR :за прибутком минулого року
|
||||
STR_SORT_BY_PROFIT_THIS_YEAR :за прибутком цього року
|
||||
|
||||
@@ -40,7 +40,6 @@ static RailType _railtype_selected_in_replace_gui;
|
||||
|
||||
typedef int CDECL VehicleSortListingTypeFunction(const void*, const void*);
|
||||
|
||||
static VehicleSortListingTypeFunction VehicleUnsortedSorter;
|
||||
static VehicleSortListingTypeFunction VehicleNumberSorter;
|
||||
static VehicleSortListingTypeFunction VehicleNameSorter;
|
||||
static VehicleSortListingTypeFunction VehicleAgeSorter;
|
||||
@@ -53,7 +52,6 @@ static VehicleSortListingTypeFunction VehicleModelSorter;
|
||||
static VehicleSortListingTypeFunction VehicleValueSorter;
|
||||
|
||||
static VehicleSortListingTypeFunction* const _vehicle_sorter[] = {
|
||||
&VehicleUnsortedSorter,
|
||||
&VehicleNumberSorter,
|
||||
&VehicleNameSorter,
|
||||
&VehicleAgeSorter,
|
||||
@@ -66,8 +64,7 @@ static VehicleSortListingTypeFunction* const _vehicle_sorter[] = {
|
||||
&VehicleValueSorter,
|
||||
};
|
||||
|
||||
const StringID _vehicle_sort_listing[] = {
|
||||
STR_SORT_BY_UNSORTED,
|
||||
static const StringID _vehicle_sort_listing[] = {
|
||||
STR_SORT_BY_NUMBER,
|
||||
STR_SORT_BY_DROPDOWN_NAME,
|
||||
STR_SORT_BY_AGE,
|
||||
@@ -295,10 +292,6 @@ int ShowAdditionalText(int x, int y, int w, EngineID engine)
|
||||
* 3. (uint32)_internal_name_sorter_id: default StringID of the vehicle when no name is set. eg
|
||||
* STR_SV_TRAIN_NAME for trains or STR_SV_AIRCRAFT_NAME for aircraft
|
||||
*/
|
||||
static int CDECL VehicleUnsortedSorter(const void *a, const void *b)
|
||||
{
|
||||
return (*(const Vehicle**)a)->index - (*(const Vehicle**)b)->index;
|
||||
}
|
||||
|
||||
// if the sorting criteria had the same value, sort vehicle by unitnumber
|
||||
#define VEHICLEUNITNUMBERSORTER(r, a, b) {if (r == 0) {r = a->unitnumber - b->unitnumber;}}
|
||||
@@ -1236,9 +1229,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
|
||||
SortVehicleList(vl);
|
||||
SetVScrollCount(w, vl->list_length);
|
||||
|
||||
// disable 'Sort By' tooltip on Unsorted sorting criteria
|
||||
if (vl->sort_type == SORT_BY_UNSORTED) SETBIT(w->disabled_state, 3);
|
||||
|
||||
/* draw the widgets */
|
||||
switch (window_type) {
|
||||
case VLW_SHARED_ORDERS:
|
||||
@@ -1456,8 +1446,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
|
||||
case VEH_Aircraft: _sorting.aircraft.criteria = vl->sort_type; break;
|
||||
default: NOT_REACHED(); break;
|
||||
}
|
||||
// enable 'Sort By' if a sorter criteria is chosen
|
||||
if (vl->sort_type != SORT_BY_UNSORTED) CLRBIT(w->disabled_state, 3);
|
||||
}
|
||||
SetWindowDirty(w);
|
||||
break;
|
||||
|
||||
@@ -18,8 +18,6 @@ void RebuildVehicleLists(void);
|
||||
void ResortVehicleLists(void);
|
||||
|
||||
#define PERIODIC_RESORT_DAYS 10
|
||||
#define SORT_BY_UNSORTED 0
|
||||
extern const StringID _vehicle_sort_listing[];
|
||||
|
||||
typedef struct Listing {
|
||||
bool order; // Ascending/descending?
|
||||
|
||||
Reference in New Issue
Block a user