diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2020-04-05 19:36:25 +0100 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-01-08 16:43:51 +0100 |
| commit | 188bf0fbc92b26cbbd5bcd67c5352ab7f6ad769b (patch) | |
| tree | 57612b6562f01b4f201a44df58ab3f847ef76614 | |
| parent | b9f3e45af7bef330acdd87cfc9c8086433d6c439 (diff) | |
| download | openttd-188bf0fbc92b26cbbd5bcd67c5352ab7f6ad769b.tar.xz | |
Change: Remove disable_unsuitable_building setting
This setting is no longer useful, as you can now always build roads,
canals, etc.
| -rw-r--r-- | src/settings_gui.cpp | 1 | ||||
| -rw-r--r-- | src/settings_type.h | 1 | ||||
| -rw-r--r-- | src/table/settings.ini | 9 | ||||
| -rw-r--r-- | src/vehicle.cpp | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index f0d9b7f3b..e04c50ac3 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1555,7 +1555,6 @@ static SettingsContainer &GetSettingsTree() construction->Add(new SettingEntry("gui.persistent_buildingtools")); construction->Add(new SettingEntry("gui.quick_goto")); construction->Add(new SettingEntry("gui.default_rail_type")); - construction->Add(new SettingEntry("gui.disable_unsuitable_building")); } interface->Add(new SettingEntry("gui.autosave")); diff --git a/src/settings_type.h b/src/settings_type.h index 219888a73..3c325a0cc 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -108,7 +108,6 @@ struct GUISettings { uint8 window_soft_limit; ///< soft limit of maximum number of non-stickied non-vital windows (0 = no limit) ZoomLevel zoom_min; ///< minimum zoom out level ZoomLevel zoom_max; ///< maximum zoom out level - bool disable_unsuitable_building; ///< disable infrastructure building when no suitable vehicles are available byte autosave; ///< how often should we do autosaves? bool threaded_saves; ///< should we do threaded saves? bool keep_all_autosave; ///< name the autosave in a different way diff --git a/src/table/settings.ini b/src/table/settings.ini index 573d8e710..eebb23f7e 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -3049,15 +3049,6 @@ str = STR_CONFIG_SETTING_WARN_LOST_VEHICLE strhelp = STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT [SDTC_BOOL] -var = gui.disable_unsuitable_building -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC -def = true -str = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING -strhelp = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT -proc = RedrawScreen -cat = SC_EXPERT - -[SDTC_BOOL] var = gui.new_nonstop flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC def = false diff --git a/src/vehicle.cpp b/src/vehicle.cpp index e8901e059..17e843255 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1792,7 +1792,6 @@ bool CanBuildVehicleInfrastructure(VehicleType type, byte subtype) assert(IsCompanyBuildableVehicleType(type)); if (!Company::IsValidID(_local_company)) return false; - if (!_settings_client.gui.disable_unsuitable_building) return true; UnitID max; switch (type) { |