(svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI.

3 files changed, 1 insertions, 61 deletions

diff --git a/src/lang/english.txt b/src/lang/english.txt
index f0d735613..8b57f5ac8 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1127,8 +1127,6 @@ STR_CONFIG_SETTING_DISASTERS_HELPTEXT                           :Toggle disaster
 STR_CONFIG_SETTING_CITY_APPROVAL                                :Town council's attitude towards area restructuring: {STRING2}
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Choose how much noise and environmental damage by companies affect their town rating and further construction actions in their area
 
-STR_CONFIG_SETTING_BUILDONSLOPES                                :Allow building on slopes and coasts: {STRING2}
-STR_CONFIG_SETTING_BUILDONSLOPES_HELPTEXT                       :If enabled, tracks and stations can be build on most slopes. If disabled, they are only allowed on slopes which match the direction of the track and thus require no foundations
 STR_CONFIG_SETTING_AUTOSLOPE                                    :Allow landscaping under buildings, tracks, etc.: {STRING2}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Allow landscaping under buildings and tracks without removing them
 STR_CONFIG_SETTING_CATCHMENT                                    :Allow more realistically sized catchment areas: {STRING2}
@@ -1153,14 +1151,8 @@ STR_CONFIG_SETTING_FORBID_90_DEG                                :Forbid trains a
 STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :90 degree turns occur when a horizontal track is directly followed by a vertical track piece on the adjacent tile, thus making the train turn by 90 degree when traversing the tile edge instead of the usual 45 degrees for other track combinations. This also applies to the turning radius of ships
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :Allow to join stations not directly adjacent: {STRING2}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :Allow adding parts to a station without directly touching the existing parts. Needs Ctrl+Click while placing the new parts
-STR_CONFIG_SETTING_IMPROVEDLOAD                                 :Use improved loading algorithm: {STRING2}
-STR_CONFIG_SETTING_IMPROVEDLOAD_HELPTEXT                        :If enabled, multiple vehicles waiting at a station are loaded sequentially. Loading of the next vehicle only starts when there is enough cargo waiting to completely fill the first vehicle
-STR_CONFIG_SETTING_GRADUAL_LOADING                              :Load vehicles gradually: {STRING2}
-STR_CONFIG_SETTING_GRADUAL_LOADING_HELPTEXT                     :Gradually load vehicles using vehicle specific loading durations, instead of loading everything at once with a fixed time depending only on the amount of cargo loaded
 STR_CONFIG_SETTING_INFLATION                                    :Inflation: {STRING2}
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Enable inflation in the economy, where costs are slightly faster rising than payments
-STR_CONFIG_SETTING_SELECTGOODS                                  :Deliver cargo to a station only when there is a demand: {STRING2}
-STR_CONFIG_SETTING_SELECTGOODS_HELPTEXT                         :Only deliver cargo to a station that was requested from a loading vehicle. This prevents bad ratings for cargoes that are not serviced at a station
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Maximum bridge length: {STRING2}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Maximum length for building bridges
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Maximum tunnel length: {STRING2}
@@ -1188,8 +1180,6 @@ STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT                       :Place where a t
 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :near end
 STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :middle
 STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :far end
-STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :Road vehicle queueing (with quantum effects): {STRING2}
-STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING_HELPTEXT               :Make road vehicle wait in front of occupied road stops until they are cleared
 STR_CONFIG_SETTING_AUTOSCROLL                                   :Pan window when mouse is at the edge: {STRING2}
 STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT                          :When enabled, viewports will start to scroll when the mouse is near the edge of the window
 STR_CONFIG_SETTING_AUTOSCROLL_DISABLED                          :Disabled
@@ -1220,10 +1210,6 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :Allow drive-thr
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :Allow construction of drive-through road stops on town-owned roads
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Allow drive-through road stops on roads owned by competitors: {STRING2}
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Allow construction of drive-through road stops on roads owned by other companies
-STR_CONFIG_SETTING_ADJACENT_STATIONS                            :Allow building adjacent stations: {STRING2}
-STR_CONFIG_SETTING_ADJACENT_STATIONS_HELPTEXT                   :Allow different stations to touch each other
-STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :Enable multiple NewGRF engine sets: {STRING2}
-STR_CONFIG_SETTING_DYNAMIC_ENGINES_HELPTEXT                     :Compatibility option for old NewGRFs. Do not disable this, unless you know exactly what you are doing!
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Changing this setting is not possible when there are vehicles
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Infrastructure maintenance: {STRING2}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :When enabled, infrastructure causes maintenance costs. The cost grows over-proportional with the network size, thus affecting bigger companies more than smaller ones
@@ -1281,8 +1267,6 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :Heightmap rotat
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Counter clockwise
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Clockwise
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :The height level a flat scenario map gets: {STRING2}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :Enable landscaping the tiles at the map borders: {STRING2}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES_HELPTEXT               :If disabled, the map borders will always be ocean
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}One or more tiles at the northern edge are not empty
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}One or more tiles at one of the edges is not water
 
@@ -1339,11 +1323,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :long (31st Dec
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :short (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
 
-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE                       :Default palette to assume for NewGRFs not specifying a palette: {STRING2}
-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_HELPTEXT              :Default palette to use for NewGRFs that do not specify which one they need
-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS                   :Default (D) palette
-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_WIN                   :Legacy (W) palette
-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :Automatically pause when starting a new game: {STRING2}
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT                   :When enabled, the game will automatically pause when starting a new game, allowing for closer study of the map
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :When paused allow: {STRING2}
@@ -1565,8 +1544,6 @@ STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 in {COMMA}
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :None
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Initial city size multiplier: {STRING2}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Average size of cities relative to normal towns at start of the game
-STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :Remove absurd road-elements during the road construction: {STRING2}
-STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD_HELPTEXT               :Remove dead road ends during funded road reconstruction
 
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL                           :Update distribution graph every {STRING2} day{P 0:2 "" s}
 STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :Time between subsequent recalculations of the link graph. Each recalculation calculates the plans for one component of the graph. That means that a value X for this setting does not mean the whole graph will be updated every X days. Only some component will. The shorter you set it the more CPU time will be necessary to calculate it. The longer you set it the longer it will take until the cargo distribution starts on new routes.
@@ -1641,7 +1618,6 @@ STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Interac
 STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Sound effects
 STR_CONFIG_SETTING_NEWS                                         :{ORANGE}News and messages
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Signals
-STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Cargo handling
 STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computer players
 STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Autorenew
 STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Servicing
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 5d4a659f9..e8b181f91 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1474,7 +1474,6 @@ static SettingEntry _settings_ui[] = {
 	SettingEntry("gui.hover_delay"),
 	SettingEntry("gui.toolbar_pos"),
 	SettingEntry("gui.statusbar_pos"),
-	SettingEntry("gui.newgrf_default_palette"),
 	SettingEntry("gui.pause_on_newgame"),
 	SettingEntry("gui.advanced_vehicle_list"),
 	SettingEntry("gui.timetable_in_ticks"),
@@ -1500,7 +1499,6 @@ static SettingsPage _settings_construction_signals_page = {_settings_constructio
 
 static SettingEntry _settings_construction[] = {
 	SettingEntry(&_settings_construction_signals_page, STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS),
-	SettingEntry("construction.build_on_slopes"),
 	SettingEntry("construction.autoslope"),
 	SettingEntry("construction.extra_dynamite"),
 	SettingEntry("construction.max_bridge_length"),
@@ -1508,22 +1506,11 @@ static SettingEntry _settings_construction[] = {
 	SettingEntry("station.never_expire_airports"),
 	SettingEntry("construction.freeform_edges"),
 	SettingEntry("construction.extra_tree_placement"),
-	SettingEntry("construction.command_pause_level"),
 };
 /** Construction sub-page */
 static SettingsPage _settings_construction_page = {_settings_construction, lengthof(_settings_construction)};
 
-static SettingEntry _settings_stations_cargo[] = {
-	SettingEntry("order.improved_load"),
-	SettingEntry("order.gradual_loading"),
-	SettingEntry("order.selectgoods"),
-};
-/** Cargo handling sub-page */
-static SettingsPage _settings_stations_cargo_page = {_settings_stations_cargo, lengthof(_settings_stations_cargo)};
-
 static SettingEntry _settings_stations[] = {
-	SettingEntry(&_settings_stations_cargo_page, STR_CONFIG_SETTING_STATIONS_CARGOHANDLING),
-	SettingEntry("station.adjacent_stations"),
 	SettingEntry("station.distant_join_stations"),
 	SettingEntry("station.station_spread"),
 	SettingEntry("economy.station_noise_level"),
@@ -1544,7 +1531,6 @@ static SettingEntry _settings_economy_towns[] = {
 	SettingEntry("economy.allow_town_roads"),
 	SettingEntry("economy.allow_town_level_crossings"),
 	SettingEntry("economy.found_town"),
-	SettingEntry("economy.mod_road_rebuild"),
 	SettingEntry("economy.town_growth_rate"),
 	SettingEntry("economy.larger_towns"),
 	SettingEntry("economy.initial_city_size"),
@@ -1620,7 +1606,6 @@ static SettingEntry _settings_vehicles_routing[] = {
 	SettingEntry("pf.pathfinder_for_trains"),
 	SettingEntry("pf.forbid_90_deg"),
 	SettingEntry("pf.pathfinder_for_roadvehs"),
-	SettingEntry("pf.roadveh_queue"),
 	SettingEntry("pf.pathfinder_for_ships"),
 };
 /** Autorenew sub-page */
@@ -1677,7 +1662,6 @@ static SettingEntry _settings_vehicles[] = {
 	SettingEntry("vehicle.max_ships"),
 	SettingEntry("vehicle.plane_speed"),
 	SettingEntry("vehicle.plane_crashes"),
-	SettingEntry("vehicle.dynamic_engines"),
 	SettingEntry("vehicle.roadveh_acceleration_model"),
 	SettingEntry("vehicle.roadveh_slope_steepness"),
 	SettingEntry("vehicle.smoke_amount"),
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 7c55ae9ef..5fdfa71d2 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -372,8 +372,6 @@ base     = GameSettings
 var      = construction.build_on_slopes
 guiflags = SGF_NO_NETWORK
 def      = true
-str      = STR_CONFIG_SETTING_BUILDONSLOPES
-strhelp  = STR_CONFIG_SETTING_BUILDONSLOPES_HELPTEXT
 cat      = SC_EXPERT
 
 [SDT_VAR]
@@ -824,8 +822,6 @@ to       = 158
 base     = GameSettings
 var      = pf.roadveh_queue
 def      = true
-str      = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING
-strhelp  = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING_HELPTEXT
 cat      = SC_EXPERT
 
 [SDT_BOOL]
@@ -1079,8 +1075,6 @@ var      = vehicle.dynamic_engines
 from     = 95
 guiflags = SGF_NO_NETWORK
 def      = true
-str      = STR_CONFIG_SETTING_DYNAMIC_ENGINES
-strhelp  = STR_CONFIG_SETTING_DYNAMIC_ENGINES_HELPTEXT
 proc     = ChangeDynamicEngines
 cat      = SC_EXPERT
 
@@ -1115,16 +1109,13 @@ base     = GameSettings
 var      = order.improved_load
 guiflags = SGF_NO_NETWORK
 def      = true
-str      = STR_CONFIG_SETTING_IMPROVEDLOAD
-strhelp  = STR_CONFIG_SETTING_IMPROVEDLOAD_HELPTEXT
 cat      = SC_EXPERT
 
 [SDT_BOOL]
 base     = GameSettings
 var      = order.selectgoods
 def      = true
-str      = STR_CONFIG_SETTING_SELECTGOODS
-strhelp  = STR_CONFIG_SETTING_SELECTGOODS_HELPTEXT
+cat      = SC_EXPERT
 
 [SDTC_BOOL]
 var      = gui.sg_new_nonstop
@@ -1173,8 +1164,6 @@ var      = order.gradual_loading
 from     = 40
 guiflags = SGF_NO_NETWORK
 def      = true
-str      = STR_CONFIG_SETTING_GRADUAL_LOADING
-strhelp  = STR_CONFIG_SETTING_GRADUAL_LOADING_HELPTEXT
 cat      = SC_EXPERT
 
 [SDT_BOOL]
@@ -1200,8 +1189,6 @@ base     = GameSettings
 var      = station.adjacent_stations
 from     = 62
 def      = true
-str      = STR_CONFIG_SETTING_ADJACENT_STATIONS
-strhelp  = STR_CONFIG_SETTING_ADJACENT_STATIONS_HELPTEXT
 cat      = SC_EXPERT
 
 [SDT_BOOL]
@@ -1424,8 +1411,6 @@ base     = GameSettings
 var      = economy.mod_road_rebuild
 from     = 77
 def      = true
-str      = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
-strhelp  = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD_HELPTEXT
 cat      = SC_EXPERT
 
 ; previously ai-new setting.
@@ -2235,8 +2220,6 @@ base     = GameSettings
 var      = construction.freeform_edges
 from     = 111
 def      = true
-str      = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES
-strhelp  = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES_HELPTEXT
 proc     = CheckFreeformEdges
 cat      = SC_EXPERT
 
@@ -3153,9 +3136,6 @@ guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 1
-str      = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE
-strhelp  = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_HELPTEXT
-strval   = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS
 proc     = UpdateNewGRFConfigPalette
 cat      = SC_EXPERT