src/ship_cmd.cpp
changeset 5858 a48c5b18747a
parent 5856 c82e61d62cd3
child 5922 caa040c9e25d
equal deleted inserted replaced
5857:afb9540972c0 5858:a48c5b18747a
   272 }
   272 }
   273 
   273 
   274 static void HandleShipLoading(Vehicle *v)
   274 static void HandleShipLoading(Vehicle *v)
   275 {
   275 {
   276 	switch (v->current_order.type) {
   276 	switch (v->current_order.type) {
   277 		case OT_LOADING:
   277 		case OT_LOADING: {
   278 			if (--v->load_unload_time_rem) return;
   278 			if (--v->load_unload_time_rem) return;
   279 
   279 
   280 			if (CanFillVehicle(v) && (
   280 			if (CanFillVehicle(v) && (
   281 						v->current_order.flags & OF_FULL_LOAD ||
   281 						v->current_order.flags & OF_FULL_LOAD ||
   282 						(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED))
   282 						(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED))
   292 
   292 
   293 			Order b = v->current_order;
   293 			Order b = v->current_order;
   294 			v->LeaveStation();
   294 			v->LeaveStation();
   295 			if (!(b.flags & OF_NON_STOP)) return;
   295 			if (!(b.flags & OF_NON_STOP)) return;
   296 			break;
   296 			break;
       
   297 		}
   297 
   298 
   298 		case OT_DUMMY: break;
   299 		case OT_DUMMY: break;
   299 
   300 
   300 		default: return;
   301 		default: return;
   301 	}
   302 	}