Merge branch 'master' of git.craftbroec.nl:cb/openttd

.gitignore

@@ -1,4 +1,4 @@
-content_download
-screenshot
-save/autosave
+content_download/
+save/autosave/
+screenshot/
 windows.cfg

cfg/glibbertengel.cfg

@@ -1,6 +1,6 @@
 
 [misc]
-display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS
+display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|WAYPOINTS|SHOW_COMPETITOR_SIGNS
 fullscreen = false
 support8bpp = no
 graphicsset = 
@@ -29,7 +29,7 @@ large_aa = false
 mono_aa = false
 sprite_cache_size_px = 128
 player_face = 0
-transparency_options = 0
+transparency_options = 102
 transparency_locks = 0
 invisibility_options = 0
 keyboard = 
@@ -39,8 +39,8 @@ gui_zoom = 2
 
 [difficulty]
 max_no_competitors = 0
-number_towns = 2
-industry_density = 5
+number_towns = 1
+industry_density = 3
 max_loan = 300000
 initial_interest = 2
 vehicle_costs = 0
@@ -64,18 +64,18 @@ land_generator = 1
 oil_refinery_limit = 32
 tgen_smoothness = 1
 variety = 0
-generation_seed = 4294967295
-tree_placer = 2
+generation_seed = 1729490602
+tree_placer = 1
 heightmap_rotation = 0
 se_flat_world_height = 1
-map_x = 8
-map_y = 8
+map_x = 12
+map_y = 7
 water_borders = 15
 custom_town_number = 1
 custom_sea_level = 2
 min_river_length = 16
 river_route_random = 5
-amount_of_rivers = 2
+amount_of_rivers = 3
 
 [vehicle]
 road_side = right
@@ -104,7 +104,7 @@ servint_ships = 360
 servint_aircraft = 100
 
 [construction]
-max_heightlevel = 30
+max_heightlevel = 64
 build_on_slopes = true
 command_pause_level = 1
 terraform_per_64k_frames = 4194304
@@ -275,7 +275,7 @@ auto_scrolling = 0
 reverse_scroll = false
 smooth_scroll = false
 left_mouse_btn_scrolling = false
-right_mouse_wnd_close = false
+right_mouse_wnd_close = true
 measure_tooltip = true
 errmsg_duration = 5
 hover_delay_ms = 250
@@ -316,22 +316,22 @@ autosave_on_exit = false
 max_num_autosaves = 16
 auto_euro = true
 news_message_timeout = 2
-show_track_reservation = false
+show_track_reservation = true
 default_signal_type = 1
 cycle_signal_types = 2
 station_numtracks = 1
 station_platlength = 5
 station_dragdrop = true
-station_show_coverage = false
+station_show_coverage = true
 persistent_buildingtools = true
 expenses_layout = false
-station_gui_group_order = 0
-station_gui_sort_by = 0
+station_gui_group_order = 5
+station_gui_sort_by = 1
 station_gui_sort_order = 0
 missing_strings_threshold = 25
 graph_line_thickness = 3
 show_date_in_logs = false
-settings_restriction_mode = 0
+settings_restriction_mode = 2
 developer = 1
 newgrf_developer_tools = false
 ai_developer_tools = false
@@ -396,12 +396,12 @@ server_admin_port = 3977
 server_admin_chat = true
 server_advertise = false
 lan_internet = 0
-client_name = 
+client_name = Bergjnl
 server_password = 
 rcon_password = 
 admin_password = 
 default_company_pass = 
-server_name = Unnamed Server
+server_name = Craftbroec|Glibertengel
 connect_to_ip = 
 network_id = 7925ccfa945d4d419a9e67a4b3d2410d
 autoclean_companies = false
@@ -415,8 +415,8 @@ restart_game_year = 0
 min_active_clients = 0
 server_lang = ANY
 reload_cfg = false
-last_host = 
-last_port = 0
+last_host = 84.107.140.83
+last_port = 3979
 no_http_content_downloads = false
 
 [currency]
@@ -435,13 +435,10 @@ renew_keep_length = false
 [server_bind_addresses]
 
 [servers]
+84.107.140.83:3979 = 
 
 [bans]
 
-[newgrf]
-
-[newgrf-static]
-
 [ai_players]
 none = start_date=730
 none = start_date=730
@@ -465,3 +462,31 @@ none =
 [version]
 version_string = 1.8.0
 version_number = 18086D62
+
+[preset-all]
+56430001|2AD089EE6B73F25D79F286AD43765914|total_town_replacement_set-3.14/ttrs3w.grf = 1 0 2 1
+74677462|A2396FFDCC0F1BA37A2A89EF525CDF21|total_bridge_renewal_set.1.12/total_bridges.grf = 
+524B0301|BB7BBE4FF23B349D17ED0A682503680C|lightrailtramtracks-0.2/tramtrkw.grf = 
+FE16215C|69D13699AC16604E825F7657E6AACA72|city_tram_set-b02/cts02.grf = 
+52455400|1600687C50C5AB1E72EDD487CAD50E2A|coded_by_aegir._artwork_by_aegir-1/ae_cityw.grf = 
+52455300|37C0B839B13C4B18051580C81EEDF427|suburban_stations-1/ae_subuw.grf = 
+52455200|0E5A9C5ACD2BCAF7FA0658C3F905A660|rural_stations-1/ae_ruraw.grf = 
+4A430002|93EAC5F5396584B92D4C5F0AAAF3F6C5|industrial_stations_renewal-1.0.2/indstatr.grf = 0 1
+414C0101|8868C6AA5191153F4255C129C9472043|stations_name_from_nearby_indus-1.2.4/station_name.grf = 0 16 16
+424B5462|83FE5AA7CAFF0A307B44B297F2A259D6|bk_enhanced_tunnel_set-1.0/bktunw.grf = 
+1560B248|76BE5A3BA8C66817C14CFA05177D20D9|redfish-0.4/redfish.grf = 1 1 0
+
+[newgrf]
+56430001|2AD089EE6B73F25D79F286AD43765914|total_town_replacement_set-3.14/ttrs3w.grf = 1 0 2 1
+74677462|A2396FFDCC0F1BA37A2A89EF525CDF21|total_bridge_renewal_set.1.12/total_bridges.grf = 
+524B0301|BB7BBE4FF23B349D17ED0A682503680C|lightrailtramtracks-0.2/tramtrkw.grf = 
+FE16215C|69D13699AC16604E825F7657E6AACA72|city_tram_set-b02/cts02.grf = 
+52455400|1600687C50C5AB1E72EDD487CAD50E2A|coded_by_aegir._artwork_by_aegir-1/ae_cityw.grf = 
+52455300|37C0B839B13C4B18051580C81EEDF427|suburban_stations-1/ae_subuw.grf = 
+52455200|0E5A9C5ACD2BCAF7FA0658C3F905A660|rural_stations-1/ae_ruraw.grf = 
+4A430002|93EAC5F5396584B92D4C5F0AAAF3F6C5|industrial_stations_renewal-1.0.2/indstatr.grf = 0 1
+414C0101|8868C6AA5191153F4255C129C9472043|stations_name_from_nearby_indus-1.2.4/station_name.grf = 0 16 16
+424B5462|83FE5AA7CAFF0A307B44B297F2A259D6|bk_enhanced_tunnel_set-1.0/bktunw.grf = 
+1560B248|76BE5A3BA8C66817C14CFA05177D20D9|redfish-0.4/redfish.grf = 1 1 0
+
+[newgrf-static]