Merge branch 'adjacent_crossings-sx' into jgrpp

Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h
2015-08-02 18:18:41 +01:00
parent 78b2e5babb 09be8afd8d
commit 0afc054bff
9 changed files with 74 additions and 10 deletions
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -463,6 +463,7 @@ struct VehicleSettings {
 	byte   extend_vehicle_life;              ///< extend vehicle life by this many years
 	byte   road_side;                        ///< the side of the road vehicles drive on
 	uint8  plane_crashes;                    ///< number of plane crashes, 0 = none, 1 = reduced, 2 = normal
+	bool   adjacent_crossings;               ///< enable closing of adjacent level crossings
 };

 /** Settings related to the economy. */