summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-01-27 20:38:19 +0000
committerbjarni <bjarni@openttd.org>2005-01-27 20:38:19 +0000
commit1ae9e7b4480865289c2793ac1f9bad53090d5d40 (patch)
tree98feeae5d0f6447060ec63ffed8fcabe8ff1ce9c
parent14f0cb27045ee750b8210f90fcf4f72e7dd0c0ed (diff)
downloadopenttd-1ae9e7b4480865289c2793ac1f9bad53090d5d40.tar.xz
(svn r1699) - Feature [autoreplace] a plane will now go to the hangar right after landing if it needs to be replaced
- Fix [autoreplace] fixed a typo that could prevent autoreplaced aircraft from automatically go to a hangar
-rw-r--r--aircraft_cmd.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 66314f350..46a846d57 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -413,7 +413,7 @@ int32 CmdSendAircraftToHangar(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(v->owner))
return CMD_ERROR;
- if (v->current_order.type == OT_GOTO_DEPOT && p2 != 0) {
+ if (v->current_order.type == OT_GOTO_DEPOT && p2 == 0) {
if (flags & DC_EXEC) {
if (v->current_order.flags & OF_UNLOAD) v->cur_order_index++;
v->current_order.type = OT_DUMMY;
@@ -1579,6 +1579,17 @@ static void AircraftEventHandler_Landing(Vehicle *v, const AirportFTAClass *Airp
{
AircraftLandAirplane(v); // maybe crash airplane
v->u.air.state = ENDLANDING;
+ // check if the aircraft needs to be replaced or renewed and send it to a hangar if needed
+ if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) {
+ // only the vehicle owner needs to calculate the rest (locally)
+ if ((_autoreplace_array[v->engine_type] != v->engine_type) ||
+ (_patches.autorenew && v->age - v->max_age > (_patches.autorenew_months * 30))) {
+ // send the aircraft to the hangar at next airport
+ _current_player = _local_player;
+ DoCommandP(v->tile, v->index, 1 << 16, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR);
+ _current_player = OWNER_NONE;
+ }
+ }
}
static void AircraftEventHandler_HeliLanding(Vehicle *v, const AirportFTAClass *Airport)