Merge branch 'adjacent_crossings-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h

src/table/settings.ini

@@ -2521,6 +2521,16 @@ def      = NULL
 proc     = RedrawScreen
 cat      = SC_BASIC
 
+[SDT_BOOL]
+base     = GameSettings
+var      = vehicle.adjacent_crossings
+guiflags = SGF_NO_NETWORK
+def      = true
+str      = STR_CONFIG_SETTING_ADJACENT_CROSSINGS
+strhelp  = STR_CONFIG_SETTING_ADJACENT_CROSSINGS_HELPTEXT
+cat      = SC_BASIC
+patxname = ""adjacent_crossings.vehicle.adjacent_crossings""
+
 
 ;***************************************************************************
 ; Unsaved setting variables.