(svn r8110) -Codechange: direct Vehicle::current_order.type changes (to OT_LOADING and OT_LEAVESTATION) replaced by v->BeginLoading() and v->LeaveStation() calls. This should allow easy hooking of those state transitions in order to maintain vehicle loading queue.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 6e5b08160..c068488f3 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -3227,3 +3227,17 @@ static void Load_VEHS(void)
 extern const ChunkHandler _veh_chunk_handlers[] = {
 	{ 'VEHS', Save_VEHS, Load_VEHS, CH_SPARSE_ARRAY | CH_LAST},
 };
+
+void Vehicle::BeginLoading()
+{
+	assert(IsTileType(tile, MP_STATION) || type == VEH_Ship);
+	current_order.type = OT_LOADING;
+}
+
+void Vehicle::LeaveStation()
+{
+	assert(IsTileType(tile, MP_STATION) || type == VEH_Ship);
+	assert(current_order.type == OT_LOADING);
+	current_order.type = OT_LEAVESTATION;
+	current_order.flags = 0;
+}