From 14f4f6d104d4cf64e17ba28e197429eb317af0f4 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 26 Dec 2022 23:24:03 +0000 Subject: [PATCH] Remove now unused vehicle.flip_direction_all_trains setting --- src/lang/czech.txt | 3 --- src/lang/english.txt | 3 --- src/lang/galician.txt | 2 -- src/lang/german.txt | 3 --- src/lang/korean.txt | 3 --- src/settings_gui.cpp | 1 - src/settings_type.h | 1 - src/table/settings/settings.ini | 8 -------- 8 files changed, 24 deletions(-) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 91fcce5ce5..6edbb41e59 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1484,9 +1484,6 @@ STR_CONFIG_SETTING_CHUNNEL_HELPTEXT :Pokud je zapnut STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY :Vlaky různých společností nemohou do sebe nabourat: {STRING} STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT :Toto nastavení zabraňuje nedůvěryhodným síťovým hráčům záměrně způsobovat srážky vlaků s těmi z jiných společností v síťové hře se sdílenou železniční infrastrukturou. -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS :Všechny vlaky se mohou otáčet v depu: {STRING} -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT :Zapne otáčení vlaků v depech, i když je tato volba vypnutá v nastavení grafik. - STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING :Dlouhá silniční vozidla mohou předjíždět: {STRING} STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT :Zapne předjíždění dlouhých silničních vozidel jiná silniční vozidla. diff --git a/src/lang/english.txt b/src/lang/english.txt index f9d4da51dd..7393d989b6 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1478,9 +1478,6 @@ STR_CONFIG_SETTING_CHUNNEL_HELPTEXT :When enabled, t STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY :Trains from different companies may not crash into each other: {STRING2} STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT :This setting is primarily to prevent untrusted players deliberately causing crashes involving other companies' trains in multi-player rail infrastructure sharing games. -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS :All train vehicles may be direction flipped in depot: {STRING2} -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT :Enable flipping the direction of all train vehicles in depots, even if it is not enabled by the NewGRF. - STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING :Articulated road vehicles may overtake: {STRING2} STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT :Enable articulated road vehicles to overtake other road vehicles. diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 1d659befe0..4caeafa3ae 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -5639,8 +5639,6 @@ STR_CONFIG_SETTING_CHUNNEL :Permitir a cons STR_CONFIG_SETTING_CHUNNEL_HELPTEXT :Cando se habilita, pódense construír tunéis baixo masas de auga ao nivel do mar. Isto require que o final do tunel remate polo menos a 3 cadros de distancia da costa. STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY :Os trens das distintas compañías non poden chocar entre si: {STRING} STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT :Esta opción é básicamente para previr que xogadores que non son de confianza deliberadamente causen accidentes con trens de outras comopañías en multixogador con infraestrutura ferroviaria compartida. -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS :Todos os trens poden cambiar a direción no depósito: {STRING} -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT :Habilitar o cambio de direción de todos os trens nos depósitos, aínda que non se habilite polos NewGRF. STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING :Os vehículos articulados de estrada poden adiantar: {STRING} STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT :Habilitalo permite os vehículos articulados de estrada adiantar a outros vehículos. STR_CONFIG_SETTING_ROADVEH_CANT_QUANTUM_TUNNEL :Evitar que os vehículos de estrada pasando a través de outros cando están bloqueados: {STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt index 30df1a400a..9e21c00d93 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1453,9 +1453,6 @@ STR_CONFIG_SETTING_CHUNNEL_HELPTEXT :Wenn aktiviert, STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY :Züge verschiedener Firmen stoßen nicht mehr zusammen: {STRING} STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT :Diese Einstellung ist in erster Linie dafür da um zu verhindern, dass Spielern denen man nicht vertraut bewusst Zusammenstöße mit Zügen anderer Firmen in Multiplayer-Spielen mit Infrastructure Sharing provozieren. -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS :Erlaube Richtungswechsel aller Züge in Depots: {STRING} -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT :Aktiviert die Umkehr der Fahrtrichtung aller Züge in Depots, selbst wenn dies nicht durch das NewGRF aktiviert ist. - STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING :Erlaube Überholen durch mehrgliedrige Straßenfahrzeuge: {STRING} STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT :Aktiviert das Überholen von Straßenfahrzeugen durch mehrgliedrige Straßenfahrzeuge. diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 820ab1218c..8059d51f38 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1479,9 +1479,6 @@ STR_CONFIG_SETTING_CHUNNEL_HELPTEXT :이 설정을 STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY :다른 회사의 열차가 서로 충돌할 수 없게 함: {STRING} STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT :이 옵션은 주로 시설 공유가 활성화된 멀티 플레이 게임에서 신뢰할 수 없는 플레이어에 의해 의도적으로 충돌이 생기는 것을 막기 위해 사용합니다. -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS :모든 열차가 차량기지에서 뒤집어질 수 있게 함: {STRING} -STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT :NewGRF에서 차량기지에서 열차의 방향을 뒤집을 수 없도록 설정되어 있어도 무시하고 열차를 차량기지에서 뒤집을 수 있게 합니다. - STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING :굴절 차량의 추월을 허용: {STRING} STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT :굴절 차량이 다른 차량을 추월할 수 있도록 허용합니다. diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 38eb6eb5ed..e10065d527 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -2100,7 +2100,6 @@ static SettingsContainer &GetSettingsTree() vehicles->Add(new SettingEntry("order.nonstop_only")); vehicles->Add(new SettingEntry("vehicle.adjacent_crossings")); vehicles->Add(new SettingEntry("vehicle.safer_crossings")); - vehicles->Add(new SettingEntry("vehicle.flip_direction_all_trains")); } SettingsPage *limitations = main->Add(new SettingsPage(STR_CONFIG_SETTING_LIMITATIONS)); diff --git a/src/settings_type.h b/src/settings_type.h index 3b0cca7a0b..23fd83ba8e 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -642,7 +642,6 @@ struct VehicleSettings { uint8 repair_cost; ///< cost of repairing vehicle bool ship_collision_avoidance; ///< ships try to avoid colliding with each other bool no_train_crash_other_company; ///< trains cannot crash with trains from other companies - bool flip_direction_all_trains; ///< enable flipping direction in depot for all train engine types bool roadveh_articulated_overtaking; ///< enable articulated road vehicles overtaking other vehicles bool roadveh_cant_quantum_tunnel; ///< enable or disable vehicles quantum tunelling through over vehicles when blocked bool drive_through_train_depot; ///< enable drive-through train depot emulation diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini index 7aa175fed2..39f6d91f72 100644 --- a/src/table/settings/settings.ini +++ b/src/table/settings/settings.ini @@ -1893,14 +1893,6 @@ strhelp = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) patxname = ""infra_sharing.vehicle.no_train_crash_other_company"" -[SDT_BOOL] -var = vehicle.flip_direction_all_trains -def = false -str = STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS -strhelp = STR_CONFIG_SETTING_FLIP_DIRECTION_ALL_TRAINS_HELPTEXT -patxname = ""flip_direction_all_trains.vehicle.flip_direction_all_trains"" -cat = SC_EXPERT - [SDT_BOOL] var = vehicle.roadveh_articulated_overtaking def = true