diff options
author | rubidium <rubidium@openttd.org> | 2009-04-12 19:15:53 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-04-12 19:15:53 +0000 |
commit | ae3ebe683446272b6d90346b8a0e6508896542b1 (patch) | |
tree | 736032a72b8a906d54314360cec53d2af3037dac /src | |
parent | f46f8bd42780c31d3d4f9ba5c87790e151058258 (diff) | |
download | openttd-ae3ebe683446272b6d90346b8a0e6508896542b1.tar.xz |
(svn r16045) -Feature [FS#597]: allow sorting stations by the lowest cargo rating instead of only by the highest cargo rating (based on the idea of KeeperOfTheSoul)
Diffstat (limited to 'src')
47 files changed, 19 insertions, 47 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 0706980c2..21ec45773 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Lengte STR_SORT_BY_LIFE_TIME :Leeftyd oor STR_SORT_BY_FACILITY :Stasie tipe STR_SORT_BY_WAITING :Wagtend vrag waarde -STR_SORT_BY_RATING_MAX :Vrag gradering STR_ENGINE_SORT_ENGINE_ID :EngineID (klassieke sorteer) STR_ENGINE_SORT_COST :Koste STR_ENGINE_SORT_POWER :Krag diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 8fb98ed9e..ea5b5a08b 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :الطول STR_SORT_BY_LIFE_TIME :العمر المتبقي STR_SORT_BY_FACILITY :نوع المحطة STR_SORT_BY_WAITING :قيمة الشحنة المنتظرة -STR_SORT_BY_RATING_MAX :معدل الشحن STR_ENGINE_SORT_ENGINE_ID :نوع المحرك (قياسي( STR_ENGINE_SORT_COST :التكلفة STR_ENGINE_SORT_POWER :الطاقة diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 898ab489a..7e6f8e82c 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Tamanho STR_SORT_BY_LIFE_TIME :Vida útil restante STR_SORT_BY_FACILITY :Tipo de estação STR_SORT_BY_WAITING :Valor da carga aguardando -STR_SORT_BY_RATING_MAX :Taxa de Carga STR_ENGINE_SORT_ENGINE_ID :No de Reg (padrão) STR_ENGINE_SORT_COST :Custo STR_ENGINE_SORT_POWER :Potência diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 1ac512594..f62b13cae 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -344,7 +344,6 @@ STR_SORT_BY_LENGTH :Дължина STR_SORT_BY_LIFE_TIME :Оставащо време за експлоатация STR_SORT_BY_FACILITY :Вид на гарата STR_SORT_BY_WAITING :Цена на чакащият товар -STR_SORT_BY_RATING_MAX :Рейтинг на товара STR_ENGINE_SORT_ENGINE_ID :Двигател № (класическо сортиране) STR_ENGINE_SORT_COST :Цена STR_ENGINE_SORT_POWER :Мощност diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 7c5f77347..56183ed4d 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -341,7 +341,6 @@ STR_SORT_BY_LENGTH :Llargada STR_SORT_BY_LIFE_TIME :Temps de vida restant STR_SORT_BY_FACILITY :Tipus de estació STR_SORT_BY_WAITING :Valor de espera de càrrega -STR_SORT_BY_RATING_MAX :Rati de càrrega STR_ENGINE_SORT_ENGINE_ID :IDMotor (ordre clàssic) STR_ENGINE_SORT_COST :Cost STR_ENGINE_SORT_POWER :Potència diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 9525aed88..f90948df2 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -407,7 +407,6 @@ STR_SORT_BY_LENGTH :Dužina STR_SORT_BY_LIFE_TIME :Preostali životni vijek STR_SORT_BY_FACILITY :Vrsta postaje STR_SORT_BY_WAITING :Vrijednost tereta koji čeka -STR_SORT_BY_RATING_MAX :Ocjena tereta STR_ENGINE_SORT_ENGINE_ID :MotorID(standardno sortiranje) STR_ENGINE_SORT_COST :Cijena STR_ENGINE_SORT_POWER :Snaga diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0d7809c9c..29114ee70 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -410,7 +410,6 @@ STR_SORT_BY_LENGTH :délky STR_SORT_BY_LIFE_TIME :zbývající životnosti STR_SORT_BY_FACILITY :druhu stanice STR_SORT_BY_WAITING :množství čekajícího nákladu -STR_SORT_BY_RATING_MAX :hodnocení přepravy STR_ENGINE_SORT_ENGINE_ID :ID vozu (klasické pořadí) STR_ENGINE_SORT_COST :ceny STR_ENGINE_SORT_POWER :výkonu diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 74f2560e2..27a2e994c 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Længde STR_SORT_BY_LIFE_TIME :Resterende levetid STR_SORT_BY_FACILITY :Stationstype STR_SORT_BY_WAITING :Værdi af ventende fragt -STR_SORT_BY_RATING_MAX :Fragtbedømmelse STR_ENGINE_SORT_ENGINE_ID :Lokomotiv ID (klassisk) STR_ENGINE_SORT_COST :Omkostning STR_ENGINE_SORT_POWER :Drivmiddel diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index ee4ece81b..0a2852df1 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Lengte STR_SORT_BY_LIFE_TIME :Resterende levensverwachting STR_SORT_BY_FACILITY :Station type STR_SORT_BY_WAITING :Waarde van wachtende vracht -STR_SORT_BY_RATING_MAX :Vracht waardering STR_ENGINE_SORT_ENGINE_ID :Motor ID (klassieke soort) STR_ENGINE_SORT_COST :Kosten STR_ENGINE_SORT_POWER :Kracht diff --git a/src/lang/english.txt b/src/lang/english.txt index 08b6b6166..41dd0ba9a 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -343,7 +343,8 @@ STR_SORT_BY_LENGTH :Length STR_SORT_BY_LIFE_TIME :Remaining life time STR_SORT_BY_FACILITY :Station type STR_SORT_BY_WAITING :Waiting cargo value -STR_SORT_BY_RATING_MAX :Cargo rating +STR_SORT_BY_RATING_MAX :Highest cargo rating +STR_SORT_BY_RATING_MIN :Lowest cargo rating STR_ENGINE_SORT_ENGINE_ID :EngineID (classic sort) STR_ENGINE_SORT_COST :Cost STR_ENGINE_SORT_POWER :Power diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index bff1ece3e..6a13c4243 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -341,7 +341,6 @@ STR_SORT_BY_LENGTH :Length STR_SORT_BY_LIFE_TIME :Remaining life time STR_SORT_BY_FACILITY :Station type STR_SORT_BY_WAITING :Waiting cargo value -STR_SORT_BY_RATING_MAX :Cargo rating STR_ENGINE_SORT_ENGINE_ID :EngineID (classic sort) STR_ENGINE_SORT_COST :Cost STR_ENGINE_SORT_POWER :Power diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 9f9444b9a..741ca8acc 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -340,7 +340,6 @@ STR_SORT_BY_VALUE :Valoro STR_SORT_BY_LENGTH :Longo STR_SORT_BY_FACILITY :Stacidoma tipo STR_SORT_BY_WAITING :Valoro de atendanta ŝarĝo -STR_SORT_BY_RATING_MAX :Takso de ŝarĝo STR_ENGINE_SORT_ENGINE_ID :Maŝina ID (klasika ordigo) STR_ENGINE_SORT_COST :Kosto STR_ENGINE_SORT_POWER :Potenco diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index d651050d4..eda5ea58a 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -395,7 +395,6 @@ STR_SORT_BY_LENGTH :Pikkus STR_SORT_BY_LIFE_TIME :Allesjäänud eluaeg STR_SORT_BY_FACILITY :Jaama tüüp STR_SORT_BY_WAITING :Ootava kauba väärtus -STR_SORT_BY_RATING_MAX :Kauba hinnang STR_ENGINE_SORT_ENGINE_ID :MootoriID (klassikaline) STR_ENGINE_SORT_COST :Hind STR_ENGINE_SORT_POWER :Võimsus diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 0972f2ac9..36fa929e7 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Pituus STR_SORT_BY_LIFE_TIME :Jäljelläoleva elinikä STR_SORT_BY_FACILITY :Asematyyppi STR_SORT_BY_WAITING :Odottavan lastin arvo -STR_SORT_BY_RATING_MAX :Rahtauksen arvosana STR_ENGINE_SORT_ENGINE_ID :VeturiD (perinteinen lajittelu) STR_ENGINE_SORT_COST :Hinta STR_ENGINE_SORT_POWER :Teho diff --git a/src/lang/french.txt b/src/lang/french.txt index 658116538..1a5c7e367 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Longueur STR_SORT_BY_LIFE_TIME :Durée de vie restante STR_SORT_BY_FACILITY :Type de station STR_SORT_BY_WAITING :Marchandise en attente -STR_SORT_BY_RATING_MAX :Notation STR_ENGINE_SORT_ENGINE_ID :ID Engin (tri classique) STR_ENGINE_SORT_COST :Prix STR_ENGINE_SORT_POWER :Puissance diff --git a/src/lang/galician.txt b/src/lang/galician.txt index f0fe1f2f2..f6bae5c5e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Lonxitude STR_SORT_BY_LIFE_TIME :Tempo de vida restante STR_SORT_BY_FACILITY :Tipo de estación STR_SORT_BY_WAITING :Valor da carga en espera -STR_SORT_BY_RATING_MAX :Puntuación da carga STR_ENGINE_SORT_ENGINE_ID :EngineID (ordeación clásica) STR_ENGINE_SORT_COST :Coste STR_ENGINE_SORT_POWER :Potencia diff --git a/src/lang/german.txt b/src/lang/german.txt index 79a9f2003..64ebc274f 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Länge STR_SORT_BY_LIFE_TIME :Verbleibende Betriebsdauer STR_SORT_BY_FACILITY :Stationsart STR_SORT_BY_WAITING :Menge der wartenden Fracht -STR_SORT_BY_RATING_MAX :Frachtbewertung STR_ENGINE_SORT_ENGINE_ID :Baureihe STR_ENGINE_SORT_COST :Kosten STR_ENGINE_SORT_POWER :Leistung diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index d80f21b95..89c6263d2 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :אורך STR_SORT_BY_LIFE_TIME :זמן חיים נותר STR_SORT_BY_FACILITY :סוג תחנה STR_SORT_BY_WAITING :ערך הסחורה שמחכה -STR_SORT_BY_RATING_MAX :דירוג הסחורה STR_ENGINE_SORT_ENGINE_ID :מספר קטר STR_ENGINE_SORT_COST :מחיר STR_ENGINE_SORT_POWER :כח diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 7dd02ca8e..09a6f5453 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -376,7 +376,6 @@ STR_SORT_BY_LENGTH :Hossz STR_SORT_BY_LIFE_TIME :Élettartamból hátralévő idő STR_SORT_BY_FACILITY :Állomás típus STR_SORT_BY_WAITING :Várakozó rakomány értéke -STR_SORT_BY_RATING_MAX :Várakozó rakomány STR_ENGINE_SORT_ENGINE_ID :JárműID STR_ENGINE_SORT_COST :Ár STR_ENGINE_SORT_POWER :Telj. diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index e46801b48..c317f9626 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Lengd STR_SORT_BY_LIFE_TIME :Líftími eftir STR_SORT_BY_FACILITY :Tegund stöðvar STR_SORT_BY_WAITING :Verðgildi farms á stöð -STR_SORT_BY_RATING_MAX :Flutningur farms STR_ENGINE_SORT_ENGINE_ID :Einkenni (hefðbundin röðun) STR_ENGINE_SORT_COST :Kostnaður STR_ENGINE_SORT_POWER :Afl diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 5ac48ab24..a7c14b46a 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Panjang STR_SORT_BY_LIFE_TIME :Sisa masa pakai STR_SORT_BY_FACILITY :Tipe Stasiun STR_SORT_BY_WAITING :Nilai tunggu kargo -STR_SORT_BY_RATING_MAX :Rating Cargo STR_ENGINE_SORT_ENGINE_ID :IDMesin (klasik) STR_ENGINE_SORT_COST :Biaya STR_ENGINE_SORT_POWER :Daya diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 12064aaa3..fc4811358 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -344,7 +344,6 @@ STR_SORT_BY_LENGTH :Lunghezza STR_SORT_BY_LIFE_TIME :Vita rimanente STR_SORT_BY_FACILITY :Tipo di stazione STR_SORT_BY_WAITING :Merci in attesa -STR_SORT_BY_RATING_MAX :Valutazione servizi STR_ENGINE_SORT_ENGINE_ID :EngineID (ord. classico) STR_ENGINE_SORT_COST :Costo STR_ENGINE_SORT_POWER :Potenza diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 7f76e2a42..7e8a80ba7 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :長さ STR_SORT_BY_LIFE_TIME :残りライフタイム STR_SORT_BY_FACILITY :駅の種類 STR_SORT_BY_WAITING :到着待ち貨物の価値 -STR_SORT_BY_RATING_MAX :貨物評価 STR_ENGINE_SORT_ENGINE_ID :EngineID(旧式) STR_ENGINE_SORT_COST :値段 STR_ENGINE_SORT_POWER :出力 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index c4a044622..efc2832fc 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :길이 STR_SORT_BY_LIFE_TIME :남은 수명 STR_SORT_BY_FACILITY :역 종류 STR_SORT_BY_WAITING :대기 화물량 -STR_SORT_BY_RATING_MAX :화물 성취도 STR_ENGINE_SORT_ENGINE_ID :기관차ID STR_ENGINE_SORT_COST :가격 STR_ENGINE_SORT_POWER :힘 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 64d8da016..3d6af1953 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -344,7 +344,6 @@ STR_SORT_BY_LENGTH :Garuma STR_SORT_BY_LIFE_TIME :Atlikušā ekspluatācijas laika STR_SORT_BY_FACILITY :Stacijas veida STR_SORT_BY_WAITING :Gaidošās kravas vērtības -STR_SORT_BY_RATING_MAX :Kravas reitinga STR_ENGINE_SORT_ENGINE_ID :DzinējaID (klasiskais veids) STR_ENGINE_SORT_COST :Izmaksas STR_ENGINE_SORT_POWER :Jauda diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index f59f6b20b..6c4168914 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -376,7 +376,6 @@ STR_SORT_BY_LENGTH :Ilgį STR_SORT_BY_LIFE_TIME :Likusį gyvavimo laiką STR_SORT_BY_FACILITY :Stoties tipą STR_SORT_BY_WAITING :Laukiančio krovinio vertę -STR_SORT_BY_RATING_MAX :Krovinių reitingavimą STR_ENGINE_SORT_ENGINE_ID :VariklioID (numatytasis) STR_ENGINE_SORT_COST :Kainą STR_ENGINE_SORT_POWER :Galią diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 00bac952f..00b2ba7e9 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Längt STR_SORT_BY_LIFE_TIME :Reschtlaafzäit STR_SORT_BY_FACILITY :Statiounstyp STR_SORT_BY_WAITING :Luedungswert -STR_SORT_BY_RATING_MAX :Luedungsbewertung STR_ENGINE_SORT_ENGINE_ID :LokID (klassësch Sortéierung) STR_ENGINE_SORT_COST :Käschten STR_ENGINE_SORT_POWER :Kraaft diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index ecf96fe9a..80f03b219 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Lengde STR_SORT_BY_LIFE_TIME :Tilovers livs tid STR_SORT_BY_FACILITY :Stasjonstype STR_SORT_BY_WAITING :Verdi av ventende last -STR_SORT_BY_RATING_MAX :Vurdering av last STR_ENGINE_SORT_ENGINE_ID :MaskinID (klassisk type) STR_ENGINE_SORT_COST :Kostnad STR_ENGINE_SORT_POWER :Kraft diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 06c3ecb80..d4b441b14 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Lengde STR_SORT_BY_LIFE_TIME :Gjenståande levetid STR_SORT_BY_FACILITY :Stasjonstype STR_SORT_BY_WAITING :Verdien av ventande last -STR_SORT_BY_RATING_MAX :Vurdering av last STR_ENGINE_SORT_ENGINE_ID :MaskinID (klassisk type) STR_ENGINE_SORT_COST :Kostnad STR_ENGINE_SORT_POWER :Kraft diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index cdd08b23a..3cc3936a5 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Engthlay STR_SORT_BY_LIFE_TIME :Emainingray ifelay imetay STR_SORT_BY_FACILITY :Ationstay ypetay STR_SORT_BY_WAITING :Aitingway argocay aluevay -STR_SORT_BY_RATING_MAX :Argocay atingray STR_ENGINE_SORT_ENGINE_ID :EngineIDWAY (assicclay ortsay) STR_ENGINE_SORT_COST :Ostcay STR_ENGINE_SORT_POWER :Owerpay diff --git a/src/lang/polish.txt b/src/lang/polish.txt index dc6b258e3..0a9d6f7c7 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -387,7 +387,6 @@ STR_SORT_BY_LENGTH :Dlugosc STR_SORT_BY_LIFE_TIME :Pozostaly czas zycia STR_SORT_BY_FACILITY :Typ stacji STR_SORT_BY_WAITING :Wartość czekającego ładunku -STR_SORT_BY_RATING_MAX :Ocena ładunku STR_ENGINE_SORT_ENGINE_ID :ID pojazdu STR_ENGINE_SORT_COST :Cena STR_ENGINE_SORT_POWER :Moc diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index a697ce033..0c687bc93 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Comprimento STR_SORT_BY_LIFE_TIME :Restante tempo de vida STR_SORT_BY_FACILITY :Tipo de Estação STR_SORT_BY_WAITING :Valor da carga em espera -STR_SORT_BY_RATING_MAX :Avaliação de carga STR_ENGINE_SORT_ENGINE_ID :EngineID (ordernação clássica) STR_ENGINE_SORT_COST :Custo STR_ENGINE_SORT_POWER :Potência diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 6c3d3c42e..0ca44983c 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -341,7 +341,6 @@ STR_SORT_BY_LENGTH :Lungime STR_SORT_BY_LIFE_TIME :Durată de viaţă rămasă STR_SORT_BY_FACILITY :Tipul de statie STR_SORT_BY_WAITING :Valoarea mărfii în aşteptare -STR_SORT_BY_RATING_MAX :Evaluare încãrcãturã STR_ENGINE_SORT_ENGINE_ID :IDMotor (model clasic) STR_ENGINE_SORT_COST :Cost STR_ENGINE_SORT_POWER :Putere diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 0aad84366..21e448202 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -344,7 +344,6 @@ STR_SORT_BY_LENGTH :Длина STR_SORT_BY_LIFE_TIME :Оставшийся срок службы STR_SORT_BY_FACILITY :Тип станции STR_SORT_BY_WAITING :Кол-во товара на станции -STR_SORT_BY_RATING_MAX :Рейтинг грузов STR_ENGINE_SORT_ENGINE_ID :Название STR_ENGINE_SORT_COST :Цена STR_ENGINE_SORT_POWER :Мощность diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 168fee252..71449c285 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :长度 STR_SORT_BY_LIFE_TIME :剩余寿命年限 STR_SORT_BY_FACILITY :车站类型 STR_SORT_BY_WAITING :等待的货物价值 -STR_SORT_BY_RATING_MAX :货物评价 STR_ENGINE_SORT_ENGINE_ID :引擎ID (默认方式) STR_ENGINE_SORT_COST :费用 STR_ENGINE_SORT_POWER :功率 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 7851dab87..2217d105c 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -409,7 +409,6 @@ STR_SORT_BY_LENGTH :Dlžka STR_SORT_BY_LIFE_TIME :Zostávajúca životnost STR_SORT_BY_FACILITY :Typ stanice STR_SORT_BY_WAITING :Mnozstvo cakajuceho nakladu -STR_SORT_BY_RATING_MAX :Hodnotenie prepravy STR_ENGINE_SORT_ENGINE_ID :EngineID (netriedené) STR_ENGINE_SORT_COST :Cena STR_ENGINE_SORT_POWER :Výkon diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 4000cad02..57510a181 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -384,7 +384,6 @@ STR_SORT_BY_LENGTH :Dolžina STR_SORT_BY_LIFE_TIME :Ostala življenjska doba STR_SORT_BY_FACILITY :Tip postaje STR_SORT_BY_WAITING :Čakanje vrednosti tovora -STR_SORT_BY_RATING_MAX :Ocene tovora STR_ENGINE_SORT_ENGINE_ID :ID motorja (klasično urejanje) STR_ENGINE_SORT_COST :Cena STR_ENGINE_SORT_POWER :Moč diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 139e18da2..d32903286 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Longitud STR_SORT_BY_LIFE_TIME :Tiempo de vida remanente STR_SORT_BY_FACILITY :Tipo de estación STR_SORT_BY_WAITING :Esperando valor de la carga -STR_SORT_BY_RATING_MAX :Clasificación de la carga STR_ENGINE_SORT_ENGINE_ID :ID Locomotora (ordenación clásia) STR_ENGINE_SORT_COST :Coste STR_ENGINE_SORT_POWER :Potencia diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 067a6d7a8..6542f8504 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Längd STR_SORT_BY_LIFE_TIME :Återstående livstid STR_SORT_BY_FACILITY :Stationstyp STR_SORT_BY_WAITING :Väntande last-värde -STR_SORT_BY_RATING_MAX :Lasts-värdering STR_ENGINE_SORT_ENGINE_ID :MotorID (Klassisk Sort) STR_ENGINE_SORT_COST :Kostnad STR_ENGINE_SORT_POWER :Elektriskt diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 9c32c6b33..6c3350ce2 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -341,7 +341,6 @@ STR_SORT_BY_LENGTH :長度 STR_SORT_BY_LIFE_TIME :剩餘年限 STR_SORT_BY_FACILITY :車站種類 STR_SORT_BY_WAITING :等候客貨總值 -STR_SORT_BY_RATING_MAX :酬載評價 STR_ENGINE_SORT_ENGINE_ID :引擎編號 STR_ENGINE_SORT_COST :價值 STR_ENGINE_SORT_POWER :功率 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 5571bba8f..e2a0d69c7 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -341,7 +341,6 @@ STR_SORT_BY_LENGTH :Uzunluk STR_SORT_BY_LIFE_TIME :Kalan ömür STR_SORT_BY_FACILITY :İstasyon türü STR_SORT_BY_WAITING :Bekleyen kargo değeri -STR_SORT_BY_RATING_MAX :Kargo reytingi STR_ENGINE_SORT_ENGINE_ID :Lokoismi (klasik sira) STR_ENGINE_SORT_COST :Fiyat STR_ENGINE_SORT_POWER :Güç diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 2a0991364..90bc90406 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -467,7 +467,6 @@ STR_SORT_BY_LENGTH :за довжи STR_SORT_BY_LIFE_TIME :Залишок строку служби STR_SORT_BY_FACILITY :за типом станції STR_SORT_BY_WAITING :за ціною вантажу -STR_SORT_BY_RATING_MAX :Рейтинг вантажів STR_ENGINE_SORT_ENGINE_ID :за ID (класичне) STR_ENGINE_SORT_COST :за ціною STR_ENGINE_SORT_POWER :за потужністю diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 6ac5b4f08..e2c9c86c1 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -343,7 +343,6 @@ STR_SORT_BY_LENGTH :Μήκος STR_SORT_BY_LIFE_TIME :Υπόλοιπη διάρκεια ζωής STR_SORT_BY_FACILITY :Τύπος σταθμού STR_SORT_BY_WAITING :Αξία φορτίου σε αναμονή -STR_SORT_BY_RATING_MAX :Εκτίμηση φορτίου STR_ENGINE_SORT_ENGINE_ID :EngineID (κλασσική ταξινόμηση) STR_ENGINE_SORT_COST :Κόστος STR_ENGINE_SORT_POWER :Δύναμη diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index ff047f694..75d20df34 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -340,7 +340,6 @@ STR_SORT_BY_LENGTH :Должина STR_SORT_BY_LIFE_TIME :Преостанат животен век STR_SORT_BY_FACILITY :Вид на станица STR_SORT_BY_WAITING :Вредност на товарот кој чека -STR_SORT_BY_RATING_MAX :Рејтинг на товарот STR_ENGINE_SORT_ENGINE_ID :Идентификација на моторот (класично сортирање) STR_ENGINE_SORT_COST :Цена STR_ENGINE_SORT_POWER :Моќност diff --git a/src/lang/unfinished/serbian.txt b/src/lang/unfinished/serbian.txt index 4e4dcdd29..510ae39fd 100644 --- a/src/lang/unfinished/serbian.txt +++ b/src/lang/unfinished/serbian.txt @@ -481,7 +481,6 @@ STR_SORT_BY_LENGTH :Dužina STR_SORT_BY_LIFE_TIME :Preostao životni vek STR_SORT_BY_FACILITY :Vrsta stanice STR_SORT_BY_WAITING :Vrednost tovara na čekanju -STR_SORT_BY_RATING_MAX :Kvalitet usluge STR_ENGINE_SORT_ENGINE_ID :ID mašine (standardno) STR_ENGINE_SORT_COST :Cena STR_ENGINE_SORT_POWER :Snaga diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index f8d3f8bc9..2373270f1 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -342,7 +342,6 @@ STR_SORT_BY_LENGTH :Hyd STR_SORT_BY_LIFE_TIME :Oes yn weddill STR_SORT_BY_FACILITY :Math Gorsaf STR_SORT_BY_WAITING :Gwerth y cargo sy'n Disgwyl -STR_SORT_BY_RATING_MAX :Graddfa Llwythi STR_ENGINE_SORT_ENGINE_ID :ID Injan (math clasurol) STR_ENGINE_SORT_COST :Côst STR_ENGINE_SORT_POWER :Pŵer diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 185e8d382..a39b42388 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -219,6 +219,20 @@ protected: return maxr1 - maxr2; } + /** Sort stations by their rating */ + static int CDECL StationRatingMinSorter(const Station * const *a, const Station * const *b) + { + byte minr1 = 0; + byte minr2 = 0; + + for (CargoID j = 0; j < NUM_CARGO; j++) { + if (HasBit((*a)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) minr1 = min(minr1, (*a)->goods[j].rating); + if (HasBit((*b)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) minr2 = min(minr2, (*b)->goods[j].rating); + } + + return minr1 - minr2; + } + /** Sort the stations list */ void SortStationsList() { @@ -573,7 +587,8 @@ GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = { &StationNameSorter, &StationTypeSorter, &StationWaitingSorter, - &StationRatingMaxSorter + &StationRatingMaxSorter, + &StationRatingMinSorter }; /* Names of the sorting functions */ @@ -582,6 +597,7 @@ const StringID CompanyStationsWindow::sorter_names[] = { STR_SORT_BY_FACILITY, STR_SORT_BY_WAITING, STR_SORT_BY_RATING_MAX, + STR_SORT_BY_RATING_MIN, INVALID_STRING_ID }; |