Merge branch 'master' into jgrpp

Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h

src/table/settings.ini

@@ -50,7 +50,6 @@ static bool DayLengthChanged(int32 p1);
 static bool SimulatedWormholeSignalsChanged(int32 p1);
 static bool EnableSingleVehSharedOrderGuiChanged(int32 p1);
 
-#ifdef ENABLE_NETWORK
 static bool UpdateClientName(int32 p1);
 static bool UpdateServerPassword(int32 p1);
 static bool UpdateRconPassword(int32 p1);
@@ -59,7 +58,6 @@ static bool CheckSharingRail(int32 p1);
 static bool CheckSharingRoad(int32 p1);
 static bool CheckSharingWater(int32 p1);
 static bool CheckSharingAir(int32 p1);
-#endif /* ENABLE_NETWORK */
 /* End - Callback Functions for the various settings */
 
 /* Begin - GUI order callbacks */
@@ -1132,12 +1130,12 @@ type     = SLE_UINT8
 from     = SLV_87
 guiflags = SGF_MULTISTRING
 def      = 2
-min      = 0
+min      = 1
 max      = 2
 interval = 1
 str      = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS
 strhelp  = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT
-strval   = STR_CONFIG_SETTING_PATHFINDER_OPF
+strval   = STR_CONFIG_SETTING_PATHFINDER_NPF
 proc     = InvalidateShipPathCache
 cat      = SC_EXPERT
 
@@ -2277,23 +2275,10 @@ max      = 255
 cat      = SC_EXPERT
 
 ##
-[SDT_VAR]
-base     = GameSettings
-var      = pf.opf.pf_maxlength
-type     = SLE_UINT16
-def      = 4096
-min      = 64
-max      = 65535
-cat      = SC_EXPERT
-
-[SDT_VAR]
-base     = GameSettings
-var      = pf.opf.pf_maxdepth
-type     = SLE_UINT8
-def      = 48
-min      = 4
-max      = 255
-cat      = SC_EXPERT
+; Used to be pf.opf.pf_maxlength & pf.opf.pf_maxdepth
+[SDT_NULL]
+length   = 3
+to       = SLV_REMOVE_OPF
 
 ##
 [SDT_VAR]
@@ -4719,7 +4704,6 @@ strhelp  = STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION_HELPTEXT
 strval   = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_width_pct
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4729,7 +4713,6 @@ max      = 100
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_height
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4739,7 +4722,6 @@ max      = 255
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_timeout
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4749,7 +4731,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.sync_freq
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ -4760,7 +4741,6 @@ max      = 100
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.frame_freq
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ -4771,7 +4751,6 @@ max      = 100
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.commands_per_frame
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4782,7 +4761,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_commands_in_queue
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4793,7 +4771,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4804,7 +4781,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame_burst
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4815,7 +4791,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_init_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4826,7 +4801,6 @@ max      = 32000
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_join_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4836,7 +4810,6 @@ min      = 0
 max      = 32000
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_download_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4846,7 +4819,6 @@ min      = 0
 max      = 32000
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_password_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4856,7 +4828,6 @@ min      = 0
 max      = 32000
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_lag_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4866,14 +4837,12 @@ min      = 0
 max      = 32000
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.pause_on_join
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = true
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.server_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4884,7 +4853,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.server_admin_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4895,7 +4863,6 @@ max      = 65535
 cat      = SC_EXPERT
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.server_admin_chat
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
@@ -4903,14 +4870,12 @@ def      = true
 cat      = SC_EXPERT
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.server_advertise
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.lan_internet
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4920,7 +4885,6 @@ min      = 0
 max      = 1
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.client_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4929,7 +4893,6 @@ proc     = UpdateClientName
 cat      = SC_BASIC
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.server_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4939,7 +4902,6 @@ proc     = UpdateServerPassword
 cat      = SC_BASIC
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.rcon_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4949,7 +4911,6 @@ proc     = UpdateRconPassword
 cat      = SC_BASIC
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.admin_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4958,14 +4919,12 @@ def      = NULL
 cat      = SC_BASIC
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.default_company_pass
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.server_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4974,14 +4933,12 @@ def      = NULL
 cat      = SC_BASIC
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.connect_to_ip
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.network_id
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -4989,14 +4946,12 @@ guiflags = SGF_NETWORK_ONLY
 def      = NULL
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.autoclean_companies
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.autoclean_unprotected
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5006,7 +4961,6 @@ min      = 0
 max      = 240
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.autoclean_protected
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5016,7 +4970,6 @@ min      = 0
 max      = 240
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.autoclean_novehicles
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5026,7 +4979,6 @@ min      = 0
 max      = 240
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_companies
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5038,7 +4990,6 @@ proc     = UpdateClientConfigValues
 cat      = SC_BASIC
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_clients
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5049,7 +5000,6 @@ max      = MAX_CLIENTS
 cat      = SC_BASIC
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.max_spectators
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5061,7 +5011,6 @@ proc     = UpdateClientConfigValues
 cat      = SC_BASIC
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.restart_game_year
 type     = SLE_INT32
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5072,7 +5021,6 @@ max      = MAX_YEAR
 interval = 1
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.min_active_clients
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5082,7 +5030,6 @@ min      = 0
 max      = MAX_CLIENTS
 
 [SDTC_OMANY]
-ifdef    = ENABLE_NETWORK
 var      = network.server_lang
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5093,7 +5040,6 @@ full     = _server_langs
 cat      = SC_BASIC
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.reload_cfg
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
@@ -5101,7 +5047,6 @@ def      = false
 cat      = SC_EXPERT
 
 [SDTC_STR]
-ifdef    = ENABLE_NETWORK
 var      = network.last_host
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5109,7 +5054,6 @@ def      = """"
 cat      = SC_EXPERT
 
 [SDTC_VAR]
-ifdef    = ENABLE_NETWORK
 var      = network.last_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -5119,7 +5063,6 @@ max      = UINT16_MAX
 cat      = SC_EXPERT
 
 [SDTC_BOOL]
-ifdef    = ENABLE_NETWORK
 var      = network.no_http_content_downloads
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false