Merge branch 'master' into jgrpp

Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp

src/table/settings.ini

@@ -761,6 +761,21 @@ def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
 strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
 
+[SDT_VAR]
+base     = GameSettings
+var      = economy.town_cargogen_mode
+type     = SLE_UINT8
+from     = SLV_TOWN_CARGOGEN
+guiflags = SGF_MULTISTRING
+def      = TCGM_BITCOUNT
+min      = TCGM_BEGIN
+max      = TCGM_END - 1
+interval = 1
+str      = STR_CONFIG_SETTING_TOWN_CARGOGENMODE
+strhelp  = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT
+strval   = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL
+cat      = SC_ADVANCED
+
 ; link graph
 
 [SDT_VAR]
@@ -1470,6 +1485,15 @@ str      = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME
 strhelp  = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME_HELPTEXT
 patxname = ""station_rating.station.cargo_class_rating_wait_time""
 
+[SDT_BOOL]
+base     = GameSettings
+var      = station.serve_neutral_industries
+def      = true
+from     = SLV_SERVE_NEUTRAL_INDUSTRIES
+str      = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES
+strhelp  = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT
+proc     = StationCatchmentChanged
+
 [SDT_BOOL]
 base     = GameSettings
 var      = order.gradual_loading
@@ -2765,6 +2789,26 @@ min      = 0
 max      = 1000000
 cat      = SC_EXPERT
 
+[SDT_VAR]
+base     = GameSettings
+var      = pf.yapf.ship_curve45_penalty
+type     = SLE_UINT
+from     = SLV_SHIP_CURVE_PENALTY
+def      = 1 * YAPF_TILE_LENGTH
+min      = 0
+max      = 1000000
+cat      = SC_EXPERT
+
+[SDT_VAR]
+base     = GameSettings
+var      = pf.yapf.ship_curve90_penalty
+type     = SLE_UINT
+from     = SLV_SHIP_CURVE_PENALTY
+def      = 6 * YAPF_TILE_LENGTH
+min      = 0
+max      = 1000000
+cat      = SC_EXPERT
+
 [SDT_VAR]
 base     = GameSettings
 var      = order.old_occupancy_smoothness