From 5992dad01f28d2f2efc05eb59b5a243b6cbddba5 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 10 Apr 2008 08:30:15 +0000 Subject: (svn r12648) -Feature: allow four different non-stop types in a single game instead of two. The "TTDP compatible order" setting now only sets the default behaviour of new trains. -Feature: allow three different load type in a single game instead of two. One can choose full load all and full load any instead of full load being governed by the "full load any" patch setting. --- src/lang/afrikaans.txt | 1 - src/lang/brazilian_portuguese.txt | 1 - src/lang/bulgarian.txt | 1 - src/lang/catalan.txt | 1 - src/lang/croatian.txt | 1 - src/lang/czech.txt | 1 - src/lang/danish.txt | 1 - src/lang/dutch.txt | 1 - src/lang/english.txt | 1 - src/lang/english_US.txt | 1 - src/lang/esperanto.txt | 1 - src/lang/estonian.txt | 1 - src/lang/finnish.txt | 1 - src/lang/french.txt | 1 - src/lang/galician.txt | 1 - src/lang/german.txt | 1 - src/lang/hungarian.txt | 1 - src/lang/icelandic.txt | 1 - src/lang/italian.txt | 1 - src/lang/japanese.txt | 1 - src/lang/korean.txt | 1 - src/lang/lithuanian.txt | 1 - src/lang/norwegian_bokmal.txt | 1 - src/lang/norwegian_nynorsk.txt | 1 - src/lang/piglatin.txt | 1 - src/lang/polish.txt | 1 - src/lang/portuguese.txt | 1 - src/lang/romanian.txt | 1 - src/lang/russian.txt | 1 - src/lang/simplified_chinese.txt | 1 - src/lang/slovak.txt | 1 - src/lang/slovenian.txt | 1 - src/lang/spanish.txt | 1 - src/lang/swedish.txt | 1 - src/lang/traditional_chinese.txt | 1 - src/lang/turkish.txt | 1 - src/lang/ukrainian.txt | 1 - src/lang/unfinished/greek.txt | 1 - src/lang/unfinished/latvian.txt | 1 - src/newgrf.cpp | 4 +-- src/openttd.cpp | 9 ++++++ src/order_base.h | 34 ++++++++++++--------- src/order_cmd.cpp | 63 ++++++++++++++++++++++++++------------- src/order_gui.cpp | 25 ++++++++++------ src/order_type.h | 12 ++++---- src/saveload.cpp | 2 +- src/settings.cpp | 5 ++-- src/settings_gui.cpp | 1 - src/settings_type.h | 3 +- src/vehicle.cpp | 8 ++--- 50 files changed, 106 insertions(+), 99 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 2d0b78375..42171d85d 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1020,7 +1020,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Ontsper STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ontsper realistiese versnelling vir treine: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbied triene en skepe om 90 graad draaie te maak: {ORANGE}{STRING} {LTBLUE} (benodig NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}sluit aan trein stasies gebou naby mekaar: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlaat stasie as enige vrag vol is, as 'volle gelaai': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Gebruik verebeterde laai algoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laai voertuie geleidelik: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasie: {ORANGE}{STRING} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 95d1b4ed5..fa51772c2 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permiti STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ativar aceleração realista para trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Proibir trens e embarcações girar em angulos de 90 graus: {ORANGE}{STRING} {LTBLUE} (requer NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unir estações ferroviárias construídas juntas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carregar veículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflação: {ORANGE}{STRING} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index ce2393feb..d763c948e 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Стр STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Реалистично ускоряване на влаковете: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Забрана на влакове и кораби да правят 90 градусови завои: {ORANGE}{STRING} {LTBLUE} (трябва NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Обединяване на гари построени една до друга: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Напускане на станцията когато някой товар е пълен, при 'пълно зареждане': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Подобрен алгоритъм за зареждане: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Постепенно зареждане на автомобилите: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Инфлация: {ORANGE}{STRING} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 8fd111304..5056c6208 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Activa STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activa l'acceleració realista per als trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibeix fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING} {LTBLUE} (necessita NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ajunta estacions de tren fetes al costat d'una altra: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Marxa de l'estació quan un tipus de càrrega estigui ple, si 'càrrega completa': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Utilitza algorisme millorat de càrrega: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carrega els vehicles gradualment: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflació: {ORANGE}{STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 9985ae71a..3a3fa976c 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Omoguć STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Omogući realistično ubrzanje za vlakove: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Spoji željezničke stanice koje se izgrade jedna pokraj druge: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Napusti stanicu ako je bilo koji teret u potpunosti natovaren pri 'punom utovaru': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Koristi unaprijeđen utovarni algoritam: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postupno utovaruj u vozila: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacija: {ORANGE}{STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 06f9a102b..359a537cc 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1084,7 +1084,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Povolit STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Zapnout realistické zrychlování vlaků: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zakázat vlakům a lodím otáčení o 90 stupňů: {ORANGE}{STRING} {LTBLUE} (vyžaduje NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Odjet, když je plně naložen jakýkoli náklad při 'naložit': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Použij vylepšený algoritmus nakládání: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Nakládat vozidla postupně: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflace: {ORANGE}{STRING} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index bab359764..8e87672c5 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Aktiver STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktiver realistisk acceleration af tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbyd skibe og tog at dreje 90 grader: {ORANGE}{STRING} {LTBLUE} (skal bruge NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Foren togstationer der bygges ved siden af hinanden: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlad stationen hvis en slags last bliver fyldt, hvis 'fuld last': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Brug forbedret indlæsnings algoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last køretøjer gradvist: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index c05cea237..65014751c 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Zeer la STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistische acceleratie van treinen: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbied schepen en treinen om 90 graden te draaien: {ORANGE}{STRING} {LTBLUE} (Vereist NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Stations samenvoegen als ze naast elkaar worden gebouwd: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlaat station wanneer één lading geladen is, met 'vol laden': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Gebruik verbeterde laad algorithme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Voertuigen geleidelijk laden: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatie: {ORANGE}{STRING} diff --git a/src/lang/english.txt b/src/lang/english.txt index 50742a385..2fe65d27a 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Enable STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING1} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING1} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING1} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING1} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING1} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 6371c0887..a652a9bc2 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1023,7 +1023,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Enable STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 86e85902b..21dc95c89 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1019,7 +1019,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permesu STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permesu realecan rapidigon por trajnoj: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Trajnoj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} {LTBLUE} (bezonas NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ligu stacidomojn konstruatajn unu apud la alia: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Ĉe 'plene ŝarĝu' ekiru se ajna ŝarĝo estas plena: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laŭgrade ŝarĝu veturilojn: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacio: {ORANGE}{STRING} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 9b7caafa9..44f4b8397 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1126,7 +1126,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Luba v STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktiveeri realistlik rongide kiirendamine: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Keela rongidel ja laevadel 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (vajab NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ühenda üksteise vastu ehitatud jaamad kokku: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lahku jaamast, kui üks kaupadest on täis laetud: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Kasuta parandatud laadimisalgoritmi: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laadi veovahendeid järkjärguliselt: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatsioon: {ORANGE}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 33c07eab8..222c1fcf9 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Erittä STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Junat kiihdyttävät realistisesti: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING} {LTBLUE} (vaatii: NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Yhdistä vierekkäiset rautatieasemat: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Jätä asema, kun mikä tahansa rahti on täysi, jos 'täysi lastaus': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Lataa kulkuneuvot vähitellen: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflaatio: {ORANGE}{STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt index d4ed5e5be..46804439e 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permett STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permettre les accélérations réalistes pour les trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Interdire aux trains et navires les virages à 90° : {ORANGE}{STRING} {LTBLUE} (Nécessite le NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Joindre les gares juxtaposées: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Pleine cargaison par un seul type, si 'chargement complet': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Utiliser l'algorithme amélioré de chargement : {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Charger les véhicules graduellement: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 14aa20275..1560da08e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -994,7 +994,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permiti STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Habilita-la aceleración realista nos trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibir os trens e os barcos facer xiros de 90 graos: {ORANGE}{STRING} {LTBLUE} (require NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Xunta-las estacións construídas xuntas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Saír se calquera carga está chea,cando 'Carga chea': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usa-lo algoritmo de carga mellorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflación: {ORANGE}{STRING} STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Descarga-la carga só cando haxa demanda: {ORANGE}{STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt index e290b1e05..a14ec04c3 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Erlaube STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistische Zugbeschleunigung aktivieren: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbiete Zügen und Schiffen 90 Grad Kurven: {ORANGE}{STRING} {LTBLUE} (erfordert NWF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Bahnhöfe vereinigen, die nebeneinander gebaut werden: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlasse die Station, wenn eine Fracht vollgeladen ist: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Fahrzeuge schrittweise beladen: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 87428881c..6fe6df2af 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1091,7 +1091,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Óriás STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Vonatok valósághű gyorsulása: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}A vonatok és a hajók nem tesznek 90 fokos kanyart: {ORANGE}{STRING} {LTBLUE} (csak NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Egymás mellé építhető vonatállomások: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Bármelyik rakomány telipakolása esetén induljon a jármű: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}A továbbfejlesztett betöltés használata: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Járművek fokozatos rakodása: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infláció: {ORANGE}{STRING} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index b2b883226..8a8416baa 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Leyfa m STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Banna lestum og skipum að taka 90° beygjur: {ORANGE}{STRING} {LTBLUE} (þarfnast NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'Fullferma' á við um frysta farm sem fullfermist: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Ferma farartæki smám saman: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Verðbólga: {ORANGE}{STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 68ed3a6d8..a040ec9e0 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Consent STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Abilita accelerazione realistica per i treni: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Impedisci a treni e navi di curvare a 90°: {ORANGE}{STRING} {LTBLUE} (richiede NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unisci le stazioni ferroviarie costruite una accanto all'altra: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lascia stazione quando una qualsiasi merce è a pieno carico: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usa l'algoritmo di caricamento migliorato: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carica i veicoli gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflazione: {ORANGE}{STRING} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index cf1563133..2c040f01e 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}超長 STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}列車の現実的な加速を使用：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}列車／船舶が直角で曲げれないようにする：{ORANGE}{STRING}{LTBLUE}（NPF が必要） STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}隣接した駅を一つの駅に統合：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}全負荷が入の場合、何でもの貨物が「全負荷」となるときに出発：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}改良した読み込むアルゴリズムを使用：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}車両を次第に読み込む：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}インフレ：{ORANGE}{STRING} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 6470d663b..39e312a45 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}매우 STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}사실감있는 열차 가속 사용 : {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}열차/선박의 90도 회전을 금지함: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}바로 옆에 역이 있으면 그 역의 이름으로 건설 (새로운 이름X) : {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'전체 싣기'인 경우, 단 하나의 화물이라도 차면 역을 떠남 : {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}향상된 수송 알고리즘 사용 : {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}점차적으로 차량 싣기 : {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}인플레이션 (화폐가치하락) : {ORANGE}{STRING} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index e4da5dceb..8f6b92d89 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Leisti STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistiska traukiniu akseleracija: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Drausti traukiniams/laivams suktis 90 laips.kampu: {ORANGE}{STRING} {LTBLUE} (reik. NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Leisti sujungti greta pastatytas stoteles: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Palikti stotele, jei nors 1 krovinys pilnai pakrautas: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Naudoti patobulinta krovimo algoritma: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Pakrauti tr. priemones paeiliui: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infliacija: {ORANGE}{STRING} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 57b94f483..dd0053ca2 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1025,7 +1025,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Tillat STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forby tog og skip å gjøre 90-graders svinger: {ORANGE}{STRING} {LTBLUE} (trenger NGR) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Slå sammen stasjoner som bygges ved siden av hverandre: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlat stasjonen når én type varevogn er full, hvis 'full last' er på: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Bruk forbedret lastingsalgoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last kjøretøy gradvis: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasjon: {ORANGE}{STRING} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index c8c220f69..512fa7d58 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1024,7 +1024,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Tillat STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forby tog og skip mot å gjere 90-graderssvingar: {ORANGE}{STRING} {LTBLUE} (treng NGR) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Slå saman stasjoner som vert bygde på sida av einannan: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlat stasjonen når éin type varevogn er full, dersom 'full last' er på: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Bruk forbetra lastingsalgoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last køyretøy gradvis: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasjon: {ORANGE}{STRING} diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 969a8dc44..2fd1a7f01 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Enablew STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enableway ealisticray accelerationway orfay ainstray: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Orbidfay ainstray andway ipsshay otay akemay 90 egday urnstay: {ORANGE}{STRING} {LTBLUE} (equiresray NPFay) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Oinjay aintray ationsstay uiltbay extnay otay eachway otherway: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Eavelay ationstay enwhay anyway argocay isway ullfay, ifway 'ullfay oad'lay: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Useway improvedway oadinglay algorithmway: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Oadlay ehiclesvay aduallygray: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflationway: {ORANGE}{STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 87be054b2..6a3969820 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1110,7 +1110,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Pozwól STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistyczne przyspieszenie pociągów: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zabroń pociągom i statkom skręcać o 90st: {ORANGE}{STRING} {LTBLUE} (wymaga NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Połącz stacje budowane jedna obok drugiej: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Opuść stację gdy dowolny ładunek jest pełny, przy 'Załadunku': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Użyj ulepszonego algorytmu załadunku: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Stopniowy załadunek pojazdów: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacja: {ORANGE}{STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 46cf9ce46..12feda9f5 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permiti STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activar aceleração realista para comboios: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Proibir comboios e barcos de virar a 90 graus: {ORANGE}{STRING} {LTBLUE} (req. NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Juntar estações ferroviárias construídas pegadas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Deixar estação quando uma das cargas esteja completa: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carregar veículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflação: {ORANGE}{STRING} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index c7aa40776..22f4f732f 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1024,7 +1024,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permite STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permite acceleratie realisticã pentru trenuri: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING} {LTBLUE} (necesita NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Pãrãseste statia când orice tip de marfã este 'full load': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Foloseste algoritm incarcare imbunatatit: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Incarca vehiculele gradual: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatia: {ORANGE}{STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 5b96340b3..29ce5208d 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Раз STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Включить реалистичное ускорение для поездов: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Запретить 90-градусные повороты на ж/д и море: {ORANGE}{STRING} {LTBLUE} (NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Объединять рядом построенные ж/д станции: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Покидать станцию, когда любой груз полностью загружен: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Использовать улучшенный алгоритм загрузки: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Постепенная загрузка транспорта: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Включить инфляцию: {ORANGE}{STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 42b486ba8..47a7d5f8d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}允许 STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}打开仿真的列车加速模式：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}禁止列车和轮船 90 度转弯：{ORANGE}{STRING} {LTBLUE} (需要 NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}将相邻的火车站进行整合：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}在“装货”模式时，只要装满任意一种即可：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用进阶的装货算法：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}装货时循序渐进：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通货膨胀：{ORANGE}{STRING} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index f25b91645..95644cd9c 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1090,7 +1090,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Umožni STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Zapnut realnu akceleraciu vlakov: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zakázat vlakom a lodiam otácanie o 90 st.: {ORANGE}{STRING} {LTBLUE} (vyžaduje NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Umoznit spajanie stanic: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Opustit stanicu ked jeden z nakladov je plny, pri 'plne naloz': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Pouzit vylepseny algoritmus nakladania: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postupné nakladanie vozidiel: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflácia: {ORANGE}{STRING} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 53ec4a21a..eeed9fa05 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1068,7 +1068,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Omogoč STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Omogoči bolj resnične pospeške vlakov: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prepreči vlakom in ladjam 90-stopinjske zavoje: {ORANGE}{STRING} {LTBLUE} (potrebuje NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Združi železniške postaje, ki si stojijo blizu: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Zapusti postajo ko je ves tovor napolnjen ob podukazu 'napolni do vrha': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Uporabi izboljšan algoritem polnjenja: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postopno polni vozila: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacija: {ORANGE}{STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 5b173d2f6..ba468fb67 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permiti STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activar aceleración realista de trenes: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibir a trenes/barcos giros de 90 grados: {ORANGE}{STRING} {LTBLUE} (requiere NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Cargar vehículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacción: {ORANGE}{STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 3f5c62ba1..2f323da2f 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Tillåt STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktivera realistisk acceleration för tåg: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Förbjud tåg och skepp att göra 90° svängar: {ORANGE}{STRING} {LTBLUE} (kräver NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Kombinera tågstationer som byggs bredvid varandra: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lämna stationen när något gods är fullt, om 'full load': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Använd förbättrad algoritm: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Lasta fordon gradvis: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index bfcc146b7..daa960504 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1020,7 +1020,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}提高 STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}真實的列車加速：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}禁止列車直角轉向：{ORANGE}{STRING} {LTBLUE} (需要啟用 NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}合併建在一起的車站：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}其中一種貨物滿載，列車即可離開車站：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用改善過的載貨演算法：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}逐步載貨：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通貨膨脹：{ORANGE}{STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index fd818ba63..6fd23453b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1025,7 +1025,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Çok uz STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Gerçekçi tren hızlanması: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Tren ve gemilerin 90 derece dönmesini yasakla: {ORANGE}{STRING} {LTBLUE} (NPF gerektirir) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Yan yana yapılan tren istasyonlarını birleştir: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'tam doldur' etkinse istasyonu tam dolunca terket: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Geliştirilmiş yükleme algoritması kullan: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Araçlar yavaş yavaş dolsun: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Enflasyon: {ORANGE}{STRING} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 6f9011680..fdfdb6648 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1151,7 +1151,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Буд STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Реалістичне прискорення поїздів: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Поїздам і кораблям не повертати на 90 град.: {ORANGE}{STRING} {LTBLUE} (треба NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Будувати суміжні залізничні станції: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Від'їжджати при повному завантаженні будь-якого вантажу: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Використовувати покращений алгоритм завантаження: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Завантажувати поступово: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Інфляція: {ORANGE}{STRING} diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 23e4d68be..59d46c5c5 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1013,7 +1013,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Επι STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ενεργοποίηση ρεαλιστικής επιτάχυνσης για τα τρένα: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Απαγόρευση στροφών 90 μοιρών για τρένα και πλοία: {ORANGE}{STRING} {LTBLUE} (απαιτεί NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Σύνδεση σταθμών τρένων χτισμένων κοντά: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Αναχώρηση από το σταθμό όταν οποιοδήποτε φορτίο είναι πλήρες, όταν 'πλήρης φόρτος': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Χρησιμοποίηση βελτιωμένου αλγόριθμου φόρτωσης: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Φόρτωση οχημάτων σταδιακά: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Πληθωρισμός: {ORANGE}{STRING} diff --git a/src/lang/unfinished/latvian.txt b/src/lang/unfinished/latvian.txt index d5ee82561..ad94f3e00 100644 --- a/src/lang/unfinished/latvian.txt +++ b/src/lang/unfinished/latvian.txt @@ -1007,7 +1007,6 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Atl'aut STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Atl'aut rea'lu vilcienu pa'atrina'jumu: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Aizliedz vilcieniem un kug'iem taisi't 90 gra'du pagriezienus: {ORANGE}{STRING} {LTBLUE} (nepiecies'ams NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Savienot vilciena stacijas kas celtas blakus: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Izbraukt no stacijas ja jebkura krava ir uzpildi'ta un "pilna krava" ir iesle'gta: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Lietot uzlabotu uzla'de's'anas algoritmu: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infla'cija: {ORANGE}{STRING} STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Transporte't kravu uz staciju tikai tad ja ir pieprasijums: {ORANGE}{STRING} diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 281219aae..9b93f714d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5005,8 +5005,8 @@ static void InitializeGRFSpecial() | (0 << 0x0B) // enhancedgui | (0 << 0x0C) // newagerating | ((_patches.build_on_slopes ? 1 : 0) << 0x0D) // buildonslopes - | ((_patches.full_load_any ? 1 : 0) << 0x0E) // fullloadany - | (1 << 0x0F) // planespeed - TODO depends on patch when implemented + | (1 << 0x0E) // fullloadany + | (1 << 0x0F) // planespeed | (0 << 0x10) // moreindustriesperclimate - obsolete | (0 << 0x11) // moretoylandfeatures | (1 << 0x12) // newstations diff --git a/src/openttd.cpp b/src/openttd.cpp index ec69aafb8..52fed7da1 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -2445,6 +2445,15 @@ bool AfterLoadGame() } } + if (CheckSavegameVersion(93)) { + /* Rework of orders. */ + Order *order; + FOR_ALL_ORDERS(order) order->ConvertFromOldSavegame(); + + Vehicle *v; + FOR_ALL_VEHICLES(v) v->current_order.ConvertFromOldSavegame(); + } + return InitializeWindowsAndCaches(); } diff --git a/src/order_base.h b/src/order_base.h index e3daa9098..320eae3c5 100644 --- a/src/order_base.h +++ b/src/order_base.h @@ -27,8 +27,8 @@ private: friend void Load_VEHS(); ///< Loading of ancient vehicles. friend const struct SaveLoad *GetOrderDescription(); ///< Saving and loading of orders. - OrderTypeByte type; ///< The type of order - uint8 flags; ///< 'Sub'type of order + uint8 type; ///< The type of order + non-stop flags + uint8 flags; ///< Load/unload types, depot order/action types. DestinationID dest; ///< The destination of the order. CargoID refit_cargo; ///< Refit CargoID @@ -60,13 +60,13 @@ public: * @param type the type to check against. * @return true if the order matches. */ - inline bool IsType(OrderType type) const { return this->type == type; } + inline bool IsType(OrderType type) const { return this->GetType() == type; } /** * Get the type of order of this order. * @return the order type. */ - inline OrderType GetType() const { return this->type; } + inline OrderType GetType() const { return (OrderType)GB(this->type, 0, 6); } /** * 'Free' the order @@ -161,26 +161,26 @@ public: void SetRefit(CargoID cargo, byte subtype = 0); /** How must the consist be loaded? */ - OrderLoadFlags GetLoadType() const; + inline OrderLoadFlags GetLoadType() const { return (OrderLoadFlags)GB(this->flags, 4, 4); } /** How must the consist be unloaded? */ - inline OrderUnloadFlags GetUnloadType() const { return (OrderUnloadFlags)GB(this->flags, 0, 2); } + inline OrderUnloadFlags GetUnloadType() const { return (OrderUnloadFlags)GB(this->flags, 0, 4); } /** Where must we stop? */ - OrderNonStopFlags GetNonStopType() const; + inline OrderNonStopFlags GetNonStopType() const { return (OrderNonStopFlags)GB(this->type, 6, 2); } /** What caused us going to the depot? */ - inline OrderDepotTypeFlags GetDepotOrderType() const { return (OrderDepotTypeFlags)this->flags; } + inline OrderDepotTypeFlags GetDepotOrderType() const { return (OrderDepotTypeFlags)GB(this->flags, 0, 4); } /** What are we going to do when in the depot. */ - inline OrderDepotActionFlags GetDepotActionType() const { return (OrderDepotActionFlags)(this->flags & ODATFB_HALT); } + inline OrderDepotActionFlags GetDepotActionType() const { return (OrderDepotActionFlags)GB(this->flags, 4, 4); } /** Set how the consist must be loaded. */ - inline void SetLoadType(OrderLoadFlags load_type) { SB(this->flags, 2, 1, !!load_type); } + inline void SetLoadType(OrderLoadFlags load_type) { SB(this->flags, 4, 4, load_type); } /** Set how the consist must be unloaded. */ - inline void SetUnloadType(OrderUnloadFlags unload_type) { SB(this->flags, 0, 2, unload_type); } + inline void SetUnloadType(OrderUnloadFlags unload_type) { SB(this->flags, 0, 4, unload_type); } /** Set whether we must stop at stations or not. */ - inline void SetNonStopType(OrderNonStopFlags non_stop_type) { SB(this->flags, 3, 1, !!non_stop_type); } + inline void SetNonStopType(OrderNonStopFlags non_stop_type) { SB(this->type, 6, 2, non_stop_type); } /** Set the cause to go to the depot. */ - inline void SetDepotOrderType(OrderDepotTypeFlags depot_order_type) { this->flags = depot_order_type == ODTFB_SERVICE ? ODTF_MANUAL : depot_order_type; } + inline void SetDepotOrderType(OrderDepotTypeFlags depot_order_type) { SB(this->flags, 0, 4, depot_order_type); } /** Set what we are going to do in the depot. */ - inline void SetDepotActionType(OrderDepotActionFlags depot_service_type) { this->flags = depot_service_type; } + inline void SetDepotActionType(OrderDepotActionFlags depot_service_type) { SB(this->flags, 4, 4, depot_service_type); } bool ShouldStopAtStation(const Vehicle *v, StationID station) const; @@ -204,6 +204,12 @@ public: * @note unpacking is done in the constructor. */ uint32 Pack() const; + + /** + * Converts this order from an old savegame's version; + * it moves all bits to the new location. + */ + void ConvertFromOldSavegame(); }; static inline VehicleOrderID GetMaxOrderIndex() diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index cea569137..60064fae0 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -41,21 +41,6 @@ BackuppedOrders _backup_orders_data; DEFINE_OLD_POOL_GENERIC(Order, Order); -OrderLoadFlags Order::GetLoadType() const -{ - if ((this->flags & OLFB_FULL_LOAD) == 0) return OLF_LOAD_IF_POSSIBLE; - return _patches.full_load_any ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD; -} - -OrderNonStopFlags Order::GetNonStopType() const -{ - if (_patches.new_nonstop) { - return (this->flags & 0x08) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS; - } - - return (this->flags & 0x08) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE; -} - void Order::Free() { this->type = OT_NOTHING; @@ -157,6 +142,45 @@ Order::Order(uint32 packed) this->travel_time = 0; } +void Order::ConvertFromOldSavegame() +{ + /* First handle non-stop, because those bits are going to be reused. */ + if (_patches.sg_new_nonstop) { + this->SetNonStopType((this->flags & 0x08) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); + } else { + this->SetNonStopType((this->flags & 0x08) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE); + } + + switch (this->GetType()) { + /* Only a few types need the other savegame conversions. */ + case OT_GOTO_DEPOT: case OT_GOTO_STATION: case OT_LOADING: break; + default: return; + } + + /* Then the load/depot action flags because those bits are going to be reused too + * and they reuse the non-stop bits. */ + if (this->GetType() != OT_GOTO_DEPOT) { + if ((this->flags & 4) == 0) { + this->SetLoadType(OLF_LOAD_IF_POSSIBLE); + } else { + this->SetLoadType(_patches.sg_full_load_any ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD); + } + } else { + this->SetDepotActionType(((this->flags & 6) == 4) ? ODATFB_HALT : ODATF_SERVICE_ONLY); + } + + /* Finally fix the unload/depot type flags. */ + if (this->GetType() != OT_GOTO_DEPOT) { + uint t = ((this->flags & 1) == 0) ? OUF_UNLOAD_IF_POSSIBLE : OUFB_TRANSFER; + if ((this->flags & 2) != 0) t |= OUFB_UNLOAD; + this->SetUnloadType((OrderUnloadFlags)t); + } else { + uint t = ((this->flags & 6) == 6) ? ODTFB_SERVICE : ODTF_MANUAL; + if ((this->flags & 2) != 0) t |= ODTFB_PART_OF_ORDERS; + this->SetDepotOrderType((OrderDepotTypeFlags)t); + } +} + /** * * Unpacks a order from savegames with version 4 and lower @@ -322,7 +346,7 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) } /* Non stop not allowed for non-trains. */ - // TODO: implement properly once savegame bump is done. if ((new_order.GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) != 0 && v->type != VEH_TRAIN) return CMD_ERROR; + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; /* Full load and unload are mutual exclusive. */ if ((new_order.GetLoadType() & OLFB_FULL_LOAD) && (new_order.GetUnloadType() & OUFB_UNLOAD)) return CMD_ERROR; @@ -372,7 +396,7 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) } } - // TODO: implement properly once savegame bump is done. if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; if (new_order.GetDepotOrderType() & ~ODTFB_PART_OF_ORDERS) return CMD_ERROR; if (new_order.GetDepotActionType() & ~ODATFB_HALT) return CMD_ERROR; break; @@ -390,8 +414,7 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* Order flags can be any of the following for waypoints: * [non-stop] * non-stop orders (if any) are only valid for trains */ - // TODO: implement properly once savegame bump is done. if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; - + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; break; } @@ -778,7 +801,7 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) break; case MOF_LOAD: - if ((data & ~OLFB_FULL_LOAD) != 0) return CMD_ERROR; + if (data > OLF_FULL_LOAD_ANY || data == 1) return CMD_ERROR; if (data == order->GetLoadType()) return CMD_ERROR; break; diff --git a/src/order_gui.cpp b/src/order_gui.cpp index e3c1b7fcf..6b9fc3369 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -204,8 +204,7 @@ static void DrawOrdersWindow(Window *w) SetDParam(1, STR_GO_TO_STATION); SetDParam(2, STR_ORDER_GO_TO + (v->type == VEH_TRAIN ? order->GetNonStopType() : 0)); SetDParam(3, order->GetDestination()); - /* Yes, this is ugly, but... once the savegame bump is done, it'll look a lot better! */ - SetDParam(4, _station_load_types[unload & OUFB_TRANSFER][((load & 1) | (load >> 1)) + ((unload & ~(OUFB_NO_UNLOAD | OUFB_TRANSFER)) >> 1)]); + SetDParam(4, _station_load_types[unload >> 1][load | (unload & ~(OUFB_TRANSFER | OUFB_NO_UNLOAD))]); } break; case OT_GOTO_DEPOT: { @@ -331,6 +330,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) (facil = FACIL_TRUCK_STOP, 1); if (st->facilities & facil) { order.MakeGoToStation(st_index); + if (_patches.new_nonstop && v->type == VEH_TRAIN) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); return order; } } @@ -408,9 +408,17 @@ static void OrderClick_FullLoad(Window *w, const Vehicle *v, int load_type) VehicleOrderID sel_ord = OrderGetSel(w); const Order *order = GetVehicleOrder(v, sel_ord); - if (load_type > 0) load_type += 3; - if (load_type >= 0 && (order->GetLoadType() & OLFB_FULL_LOAD) == (load_type & OLFB_FULL_LOAD)) return; - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | ((order->GetLoadType() & OLFB_FULL_LOAD) ^ OLFB_FULL_LOAD) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); + if (load_type >= 0 && order->GetLoadType() == load_type) return; + + if (load_type < 0) { + switch (order->GetLoadType()) { + case OLF_LOAD_IF_POSSIBLE: load_type = OLFB_FULL_LOAD; break; + case OLFB_FULL_LOAD: load_type = OLF_FULL_LOAD_ANY; break; + case OLF_FULL_LOAD_ANY: load_type = OLF_LOAD_IF_POSSIBLE; break; + default: NOT_REACHED(); + } + } + DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | (load_type << 2), NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); } /** @@ -451,7 +459,6 @@ static void OrderClick_Nonstop(Window *w, const Vehicle *v, int non_stop) const Order *order = GetVehicleOrder(v, sel_ord); if (order->GetNonStopType() == non_stop) return; - if (_patches.new_nonstop && non_stop == ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) non_stop = ONSF_STOP_EVERYWHERE; /* Keypress if negative, so 'toggle' to the next */ if (non_stop < 0) { @@ -650,7 +657,7 @@ static void OrdersWndProc(Window *w, WindowEvent *e) break; case ORDER_WIDGET_NON_STOP: - ShowDropDownMenu(w, _order_non_stop_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, _patches.new_nonstop ? 5 : 12, 124); + ShowDropDownMenu(w, _order_non_stop_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, 0, 124); break; case ORDER_WIDGET_GOTO: @@ -658,7 +665,7 @@ static void OrdersWndProc(Window *w, WindowEvent *e) break; case ORDER_WIDGET_FULL_LOAD: - ShowDropDownMenu(w, _order_full_load_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetLoadType() << 2, ORDER_WIDGET_FULL_LOAD, 0, _patches.full_load_any ? 2 : 4, 124); + ShowDropDownMenu(w, _order_full_load_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetLoadType() << 2, ORDER_WIDGET_FULL_LOAD, 0, 0, 124); break; case ORDER_WIDGET_UNLOAD: @@ -694,7 +701,7 @@ static void OrdersWndProc(Window *w, WindowEvent *e) break; case ORDER_WIDGET_FULL_LOAD: - OrderClick_FullLoad(w, v, e->we.dropdown.index); + OrderClick_FullLoad(w, v, e->we.dropdown.index == 0 ? 0 : e->we.dropdown.index + 1); break; } break; diff --git a/src/order_type.h b/src/order_type.h index 415fcb9b4..24fd1fc20 100644 --- a/src/order_type.h +++ b/src/order_type.h @@ -41,8 +41,8 @@ typedef TinyEnumT OrderTypeByte; */ enum OrderUnloadFlags { OUF_UNLOAD_IF_POSSIBLE = 0, ///< Unload all cargo that the station accepts. - OUFB_TRANSFER = 1 << 0, ///< Transfer all cargo onto the platform. - OUFB_UNLOAD = 1 << 1, ///< Force unloading all cargo onto the platform, possibly not getting paid. + OUFB_UNLOAD = 1 << 0, ///< Force unloading all cargo onto the platform, possibly not getting paid. + OUFB_TRANSFER = 1 << 1, ///< Transfer all cargo onto the platform. OUFB_NO_UNLOAD = 1 << 2, ///< Totally no unloading will be done. }; @@ -51,8 +51,8 @@ enum OrderUnloadFlags { */ enum OrderLoadFlags { OLF_LOAD_IF_POSSIBLE = 0, ///< Load as long as there is cargo that fits in the train. - OLFB_FULL_LOAD = 1 << 2, ///< Full load the complete the consist. - OLF_FULL_LOAD_ANY = 5, ///< Full load the a single cargo of the consist. + OLFB_FULL_LOAD = 1 << 1, ///< Full load the complete the consist. + OLF_FULL_LOAD_ANY = 3, ///< Full load the a single cargo of the consist. }; /** @@ -71,7 +71,7 @@ enum OrderNonStopFlags { */ enum OrderDepotTypeFlags { ODTF_MANUAL = 0, ///< The player initiated this order manually. - ODTFB_SERVICE = 1 << 2, ///< This depot order is because of the servicing limit. + ODTFB_SERVICE = 1 << 0, ///< This depot order is because of the servicing limit. ODTFB_PART_OF_ORDERS = 1 << 1, ///< This depot order is because of a regular order. }; @@ -80,7 +80,7 @@ enum OrderDepotTypeFlags { */ enum OrderDepotActionFlags { ODATF_SERVICE_ONLY = 0, ///< Only service the vehicle. - ODATFB_HALT = 1 << 2, ///< Service the vehicle and then halt it. + ODATFB_HALT = 1 << 0, ///< Service the vehicle and then halt it. }; /** diff --git a/src/saveload.cpp b/src/saveload.cpp index 463782c41..cfcbab3c5 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -34,7 +34,7 @@ #include "table/strings.h" -extern const uint16 SAVEGAME_VERSION = 92; +extern const uint16 SAVEGAME_VERSION = 93; uint16 _sl_version; ///< the major savegame version identifier byte _sl_minor_version; ///< the minor savegame version, DO NOT USE! diff --git a/src/settings.cpp b/src/settings.cpp index c997c466f..2478c4365 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1461,10 +1461,11 @@ const SettingDesc _patch_settings[] = { /***************************************************************************/ /* Station section of the GUI-configure patches window */ SDT_BOOL(Patches, join_stations, 0, 0, true, STR_CONFIG_PATCHES_JOINSTATIONS, NULL), - SDT_BOOL(Patches, full_load_any, 0,NN, true, STR_CONFIG_PATCHES_FULLLOADANY, NULL), + SDT_CONDBOOL(Patches, sg_full_load_any, 0, 92, 0, 0, true, STR_NULL, NULL), SDT_BOOL(Patches, improved_load, 0,NN, false, STR_CONFIG_PATCHES_IMPROVEDLOAD, NULL), SDT_BOOL(Patches, selectgoods, 0, 0, true, STR_CONFIG_PATCHES_SELECTGOODS, NULL), - SDT_BOOL(Patches, new_nonstop, 0, 0, false, STR_CONFIG_PATCHES_NEW_NONSTOP, NULL), + SDT_BOOL(Patches, new_nonstop, S, 0, false, STR_CONFIG_PATCHES_NEW_NONSTOP, NULL), + SDT_CONDBOOL(Patches, sg_new_nonstop, 0, 92, 0, 0, false, STR_NULL, NULL), SDT_BOOL(Patches, nonuniform_stations, 0,NN, true, STR_CONFIG_PATCHES_NONUNIFORM_STATIONS,NULL), SDT_VAR(Patches, station_spread,SLE_UINT8,0, 0, 12, 4, 64, 0, STR_CONFIG_PATCHES_STATION_SPREAD, InvalidateStationBuildWindow), SDT_BOOL(Patches, serviceathelipad, 0, 0, true, STR_CONFIG_PATCHES_SERVICEATHELIPAD, NULL), diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index ca58c6561..436a60b74 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -748,7 +748,6 @@ static const char *_patches_construction[] = { static const char *_patches_stations[] = { "join_stations", - "full_load_any", "improved_load", "selectgoods", "new_nonstop", diff --git a/src/settings_type.h b/src/settings_type.h index ef408749a..54903d46c 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -62,7 +62,7 @@ struct Patches { bool build_on_slopes; ///< allow building on slopes bool mammoth_trains; ///< allow very long trains bool join_stations; ///< allow joining of train stations - bool full_load_any; ///< new full load calculation, any cargo must be full + bool sg_full_load_any; ///< new full load calculation, any cargo must be full read from pre v93 savegames bool improved_load; ///< improved loading algorithm bool gradual_loading; ///< load vehicles gradually byte station_spread; ///< amount a station may spread @@ -79,6 +79,7 @@ struct Patches { bool status_long_date; ///< always show long date in status bar bool signal_side; ///< show signals on right side bool show_finances; ///< show finances at end of year + bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames bool new_nonstop; ///< ttdpatch compatible nonstop handling bool roadveh_queue; ///< buggy road vehicle queueing bool autoscroll; ///< scroll when moving mouse to the edge. diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 60f212b2d..89cfe1b5b 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -3103,7 +3103,7 @@ void Load_VEHS() /* Convert the current_order.type (which is a mix of type and flags, because * in those versions, they both were 4 bits big) to type and flags */ v->current_order.flags = GB(v->current_order.type, 4, 4); - v->current_order.type.m_val &= 0x0F; + v->current_order.type &= 0x0F; } /* Advanced vehicle lists got added */ @@ -3138,6 +3138,9 @@ void Vehicle::BeginLoading() if (this->current_order.IsType(OT_GOTO_STATION) && this->current_order.GetDestination() == this->last_station_visited) { + current_order.MakeLoading(true); + UpdateVehicleTimetable(this, true); + /* Furthermore add the Non Stop flag to mark that this station * is the actual destination of the vehicle, which is (for example) * necessary to be known for HandleTrainLoading to determine @@ -3145,10 +3148,7 @@ void Vehicle::BeginLoading() * that arrives at random stations is bad. */ this->current_order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION); - current_order.MakeLoading(true); - UpdateVehicleTimetable(this, true); } else { - this->current_order.SetNonStopType(ONSF_STOP_EVERYWHERE); current_order.MakeLoading(false); } -- cgit v1.2.3-54-g00ecf