dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11214) -Fix [FS#1296]: planes can't use heliports so refuse these orders

Browse Source
This commit is contained in:
glx
2007-10-05 22:13:35 +00:00
parent af5399fa41
commit 342025d0e1
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/order_cmd.cpp
View File

@@ -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)) {