Merge branch 'wait_in_depot-sx' into jgrpp

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

src/vehicle_base.h

@@ -294,6 +294,8 @@ public:
 
 	void HandleLoading(bool mode = false);
 
+	void HandleWaiting(bool stop_waiting = false);
+
 	void GetConsistFreeCapacities(SmallMap<CargoID, uint> &capacities) const;
 
 	uint GetConsistTotalCapacity() const;