--- a/src/aircraft_cmd.cpp	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/aircraft_cmd.cpp	Sat Jan 13 18:55:54 2007 +0000
@@ -1370,7 +1370,7 @@
 	}
 
 	old_order = v->current_order;
-	v->current_order.type = OT_LOADING;
+	v->BeginLoading();
 	v->current_order.flags = 0;
 
 	if (old_order.type == OT_GOTO_STATION &&

--- a/src/roadveh_cmd.cpp	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/roadveh_cmd.cpp	Sat Jan 13 18:55:54 2007 +0000
@@ -750,8 +750,7 @@
 			}
 
 			b = v->current_order;
-			v->current_order.type = OT_LEAVESTATION;
-			v->current_order.flags = 0;
+			v->LeaveStation();
 			if (!(b.flags & OF_NON_STOP)) return;
 			break;
 		}
@@ -1508,7 +1507,7 @@
 			RoadVehArrivesAt(v, st);
 
 			old_order = v->current_order;
-			v->current_order.type = OT_LOADING;
+			v->BeginLoading();
 			v->current_order.flags = 0;
 
 			if (old_order.type == OT_GOTO_STATION &&

--- a/src/ship_cmd.cpp	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/ship_cmd.cpp	Sat Jan 13 18:55:54 2007 +0000
@@ -292,8 +292,7 @@
 
 		{
 			Order b = v->current_order;
-			v->current_order.type = OT_LEAVESTATION;
-			v->current_order.flags = 0;
+			v->LeaveStation();
 			if (!(b.flags & OF_NON_STOP)) return;
 		}
 	}
@@ -704,7 +703,7 @@
 							/* Process station in the orderlist. */
 							st = GetStation(v->current_order.dest);
 							if (st->facilities & FACIL_DOCK) { /* ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations */
-								v->current_order.type = OT_LOADING;
+								v->BeginLoading();
 								v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER;
 								v->current_order.flags |= OF_NON_STOP;
 								ShipArrivesAt(v, st);
@@ -717,7 +716,6 @@
 								InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 							} else { /* leave stations without docks right aways */
 								v->current_order.type = OT_LEAVESTATION;
-								v->current_order.flags = 0;
 								v->cur_order_index++;
 								InvalidateVehicleOrder(v);
 							}

--- a/src/train_cmd.cpp	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/train_cmd.cpp	Sat Jan 13 18:55:54 2007 +0000
@@ -2647,8 +2647,7 @@
 
 		{
 			Order b = v->current_order;
-			v->current_order.type = OT_LEAVESTATION;
-			v->current_order.flags = 0;
+			v->LeaveStation();
 
 			// If this was not the final order, don't remove it from the list.
 			if (!(b.flags & OF_NON_STOP)) return;
@@ -2721,12 +2720,12 @@
 			v->current_order.dest == station) {
 		// Yeah, keep the load/unload flags
 		// Non Stop now means if the order should be increased.
-		v->current_order.type = OT_LOADING;
+		v->BeginLoading();
 		v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER;
 		v->current_order.flags |= OF_NON_STOP;
 	} else {
 		// No, just do a simple load
-		v->current_order.type = OT_LOADING;
+		v->BeginLoading();
 		v->current_order.flags = 0;
 	}
 	v->current_order.dest = 0;

--- a/src/vehicle.cpp	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/vehicle.cpp	Sat Jan 13 18:55:54 2007 +0000
@@ -3227,3 +3227,17 @@
 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;
+}

--- a/src/vehicle.h	Sat Jan 13 18:44:38 2007 +0000
+++ b/src/vehicle.h	Sat Jan 13 18:55:54 2007 +0000
@@ -251,6 +251,9 @@
 		VehicleDisaster disaster;
 		VehicleShip ship;
 	} u;
+
+	void BeginLoading();
+	void LeaveStation();
 };
 
 #define is_custom_sprite(x) (x >= 0xFD)