diff options
| author | glx <glx@openttd.org> | 2007-10-05 22:13:35 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-10-05 22:13:35 +0000 |
| commit | 8e5480aa1697c1e86308a898875b37324dc4200b (patch) | |
| tree | b5b767bc7b9c9aa3ef1f2fe1aa876ed2fd8bfebe /src/order_cmd.cpp | |
| parent | 0fd7d6257bfe72dcac6b78adee0ac3f83b0d4724 (diff) | |
| download | openttd-8e5480aa1697c1e86308a898875b37324dc4200b.tar.xz | |
(svn r11214) -Fix [FS#1296]: planes can't use heliports so refuse these orders
Diffstat (limited to 'src/order_cmd.cpp')
| -rw-r--r-- | src/order_cmd.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index d8c570540..e9ed59545 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -19,6 +19,7 @@ #include "vehicle_gui.h" #include "cargotype.h" #include "strings.h" +#include "aircraft.h" DEFINE_OLD_POOL_GENERIC(Order, Order) @@ -198,7 +199,9 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) break; case VEH_AIRCRAFT: - if (!(st->facilities & FACIL_AIRPORT)) return CMD_ERROR; + if (!(st->facilities & FACIL_AIRPORT) || !CanAircraftUseStation(v->engine_type, st)) { + return CMD_ERROR; + } break; default: return CMD_ERROR; @@ -239,7 +242,8 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (!CheckOwnership(st->owner) || !(st->facilities & FACIL_AIRPORT) || - st->Airport()->nof_depots == 0) { + st->Airport()->nof_depots == 0 || + !CanAircraftUseStation(v->engine_type, st)) { return CMD_ERROR; } } else { @@ -1038,7 +1042,7 @@ static TileIndex GetStationTileForVehicle(const Vehicle* v, const Station* st) switch (v->type) { default: NOT_REACHED(); case VEH_TRAIN: return st->train_tile; - case VEH_AIRCRAFT: return st->airport_tile; + case VEH_AIRCRAFT: return CanAircraftUseStation(v->engine_type, st) ? st->airport_tile : 0; case VEH_SHIP: return st->dock_tile; case VEH_ROAD: if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) { |