summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichk <richk@openttd.org>2006-06-26 20:58:49 +0000
committerrichk <richk@openttd.org>2006-06-26 20:58:49 +0000
commitba780a25d3c3a05d626e127c12a3b77e27130f9f (patch)
tree81326a9ebce6d7b7e68ded7de6c681af00300262
parent236a397f285770b83a67d166c0ad3441a52dd8e8 (diff)
downloadopenttd-ba780a25d3c3a05d626e127c12a3b77e27130f9f.tar.xz
(svn r5376) - Fix: Changed error message when trying to build a CTOL aircraft at a helidepot/helistation to "Airport has no runway". (Thanks to MeusH). Osprey can now be built at helidepot/helistation. (Thanks to mart3p).
-rw-r--r--aircraft_cmd.c4
-rw-r--r--lang/english.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 5a664abdd..8d782cffb 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -219,8 +219,8 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
// prevent building of aircraft in helidepot/helistation
st2 = GetStationByTile(tile);
- if ((avi->subtype != 0) && (GetAirport(st2->airport_type)->acc_planes == HELICOPTERS_ONLY)) {
- return_cmd_error(STR_ENGINE_NOT_BUILDABLE);
+ if ((avi->subtype & AIR_CTOL) && (GetAirport(st2->airport_type)->acc_planes == HELICOPTERS_ONLY)) {
+ return_cmd_error(STR_AIRPORT_HAS_NO_RUNWAY);
}
unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Aircraft);
diff --git a/lang/english.txt b/lang/english.txt
index 3419e1227..9e7995e8d 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -2828,6 +2828,7 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut
STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Replacing: {ORANGE}{SKIP}{SKIP}{STRING}
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} EXPERIMENTAL FEATURE {}Switch between engine and wagon replacement windows.{}Wagon replacement will only be done if the new wagon can be refitted into carrying the same type of cargo as the old one. This is checked for each wagon when the actual replacement takes place.
STR_ENGINE_NOT_BUILDABLE :{WHITE}Engine is not buildable
+STR_AIRPORT_HAS_NO_RUNWAY :{WHITE}Airport has no runway
STR_ENGINES :Engines
STR_WAGONS :Wagons