diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index 567635de3a..e3ddfacc3c 100644 --- a/src/lang/extra/czech.txt +++ b/src/lang/extra/czech.txt @@ -127,7 +127,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :Vozidla vlastn STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :Zapnout jedno vozidlo v okně sdílených příkazů: {STRING} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :Umožní použití okna sdílených příkazů pro jednotlivá vozidla i bez sdílených příkazů. -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :Prohledej okolí (vhodné pro vysoké úrovně přiblížení): {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :Zobrazit sklon: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :Zobrazit mosty: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :Zobrazit tunely: {STRING} diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 9957b38c1e..459b0614dc 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -404,7 +404,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :Vehicles in a v STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :Enable single vehicles in shared order group window: {STRING2} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :Allow using the shared order group window with single vehicles, without shared orders. -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :Scan surroundings (better for high zoom out levels): {STRING2} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :Show slopes: {STRING2} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :Show bridges: {STRING2} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :Show tunnels: {STRING2} diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index c5bb1da85f..24a7855d41 100644 --- a/src/lang/extra/galician.txt +++ b/src/lang/extra/galician.txt @@ -366,7 +366,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :Os vehículos n STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :Habilitar os vehículos individuos na fiestra de grupo de ordes compartidas: {STRING} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :Permitir usar a fiestra de grupo de ordes compartidas con vehículos individuais, sen ordes compartidas. -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :Escanear os arredores (mellor para niveis de zoom altos): {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :Amosar ladeiras: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :Amosar pontes: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :Amosar túneis: {STRING} diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt index 8c1d1ea6e9..5ccdc08b65 100644 --- a/src/lang/extra/german.txt +++ b/src/lang/extra/german.txt @@ -335,7 +335,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :Fahrzeuge in Fa STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :Erlaube ein einzelnes Fahrzeug im Fenster einer Gruppe mit gemeinsam genutzten Fahrplan: {STRING} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :Erlaube die Benutzung des Fensters für Gruppen mit gemeinsam genutzten Fahrplan auch mit nur einem Fahrzeug ohne gemeinsam genutzten Fahrplan. -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :Scanne die Umgebung einer Kachel (verbesserte Anzeige bei hohen Zoomstufen): {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :Zeige Geländesteigungen an: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :Zeige Brücken an: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :Zeige Tunnel an: {STRING} diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index 3b814a856d..8f16a7792c 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -374,7 +374,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :차량 목록 STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :경로를 공유하는 차량 창을 한 차량만 있을 때에도 활성화: {STRING} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :경로를 공유하는 모든 차량을 표시할 때 경로를 공유하는 차량이 한 대밖에 없어도 표시할지 설정합니다. -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :주변 스캔하기 (맵을 축소했을 때 유용): {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :경사 표시: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :다리 표시: {STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :터널 표시: {STRING} diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index 8b47db7454..0b9c1cf826 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -363,7 +363,6 @@ STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT :在车辆列表 STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI :允许在共享调度组窗口中的单个车辆：{STRING} STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT :允许在没有共享调度的时候对单个车辆使用共享调度组窗口。 -STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS :扫描周围（最好在高缩放比例下）：{STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES :显示斜坡：{STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES :显示桥梁：{STRING} STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS :显示隧道：{STRING} diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 591fb8c226..0428885f2e 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1990,7 +1990,6 @@ static SettingsContainer &GetSettingsTree() { viewport_map->Add(new SettingEntry("gui.default_viewport_map_mode")); viewport_map->Add(new SettingEntry("gui.action_when_viewport_map_is_dblclicked")); - viewport_map->Add(new SettingEntry("gui.viewport_map_scan_surroundings")); viewport_map->Add(new SettingEntry("gui.show_scrolling_viewport_on_map")); viewport_map->Add(new SettingEntry("gui.show_slopes_on_viewport_map")); viewport_map->Add(new SettingEntry("gui.show_bridges_on_map")); diff --git a/src/settings_type.h b/src/settings_type.h index b26081db84..17948b0aed 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -172,7 +172,6 @@ struct GUISettings : public TimeSettings { uint8 right_mouse_btn_emulation; ///< should we emulate right mouse clicking? uint8 scrollwheel_scrolling; ///< scrolling using the scroll wheel? uint8 scrollwheel_multiplier; ///< how much 'wheel' per incoming event from the OS? - bool viewport_map_scan_surroundings; ///< look for the most important tile in surroundings bool show_slopes_on_viewport_map; ///< use slope orientation to render the ground uint32 default_viewport_map_mode; ///< the mode to use by default when a viewport is in map mode, 0=owner, 1=industry, 2=vegetation uint32 action_when_viewport_map_is_dblclicked; ///< what to do when a doubleclick occurs on the viewport map diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini index 44dccfe518..83cce1c5d5 100644 --- a/src/table/settings/settings.ini +++ b/src/table/settings/settings.ini @@ -4747,13 +4747,6 @@ strhelp = STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -[SDTC_BOOL] -var = gui.viewport_map_scan_surroundings -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC -def = true -str = STR_CONFIG_SETTING_VIEWPORT_MAP_SCAN_SURROUNDINGS -post_cb = ViewportMapLandscapeModeChanged - [SDTC_BOOL] var = gui.show_slopes_on_viewport_map flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC diff --git a/src/viewport.cpp b/src/viewport.cpp index ddd5312d04..c5da6ba2a4 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -3206,7 +3206,7 @@ static inline void ViewportMapStoreBridgeAboveTile(const Viewport * const vp, co static inline TileIndex ViewportMapGetMostSignificantTileType(const Viewport * const vp, const TileIndex from_tile, TileType * const tile_type) { - if (vp->zoom <= ZOOM_LVL_OUT_128X || !_settings_client.gui.viewport_map_scan_surroundings) { + if (vp->zoom <= ZOOM_LVL_OUT_128X) { const TileType ttype = GetTileType(from_tile); /* Store bridges and tunnels. */ if (ttype != MP_TUNNELBRIDGE) {