# HG changeset patch
# User Ricardo@FX-8150
# Date 1516994947 0
#      Fri Jan 26 19:29:07 2018 +0000
# Branch trunk
# Node ID 00917ec0530db9e8d7f204e676381e0cb0fff776
# Parent  cc75dd489dcfea3e30899f3f6cf73e394399f3d5
20

diff -r cc75dd489dcf -r 00917ec0530d src/lang/english.txt
--- a/src/lang/english.txt	Fri Jan 26 19:15:48 2018 +0000
+++ b/src/lang/english.txt	Fri Jan 26 19:29:07 2018 +0000
@@ -4455,6 +4455,7 @@
 STR_ERROR_CAN_T_SKIP_TO_ORDER                                   :{WHITE}Can't skip to selected order...
 STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... vehicle can't go to all stations
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... vehicle can't go to that station
+STR_ERROR_CAN_T_ADD_ORDER_SHORT_RUNWAY                          :{WHITE}... airport runway is too short for this aeroplane
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... a vehicle sharing this order can't go to that station
 
 STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Can't share order list...
diff -r cc75dd489dcf -r 00917ec0530d src/order_cmd.cpp
--- a/src/order_cmd.cpp	Fri Jan 26 19:15:48 2018 +0000
+++ b/src/order_cmd.cpp	Fri Jan 26 19:29:07 2018 +0000
@@ -749,7 +749,17 @@
 				if (ret.Failed()) return ret;
 			}
 
-			if (!CanVehicleUseStation(v, st)) return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER);
+			if (!CanVehicleUseStation(v, st)) {
+				if (v->type == VEH_AIRCRAFT &&
+						(AircraftVehInfo(v->engine_type)->subtype & AIR_FAST) &&
+						(st->airport.GetFTA()->flags & AirportFTAClass::SHORT_STRIP) &&
+						!_settings_game.vehicle.large_plane_on_short_runway) {
+					return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER_SHORT_RUNWAY)
+				} else {
+					return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER);
+				}
+			}
+
 			for (Vehicle *u = v->FirstShared(); u != NULL; u = u->NextShared()) {
 				if (!CanVehicleUseStation(u, st)) return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER_SHARED);
 			}