Merge branch 'reverse_at_waypoint' into jgrpp

Conflicts: src/order_gui.cpp src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/train_cmd.cpp
2015-10-29 00:59:42 +00:00
parent b48a01f233 79da755c45
commit 2e6b4cc961
17 changed files with 147 additions and 36 deletions
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -759,6 +759,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
 		SLE_CONDNULL(2, 2, 19),
 		 SLE_CONDVAR(Train, gv_flags,            SLE_UINT16,                 139, SL_MAX_VERSION),
 		SLE_CONDNULL(11, 2, 143), // old reserved space
+		SLE_CONDVAR_X(Train, reverse_distance,    SLE_UINT16,                   0, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_REVERSE_AT_WAYPOINT)),

 		     SLE_END()
 	};