summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorludde <ludde@openttd.org>2005-08-08 15:26:53 +0000
committerludde <ludde@openttd.org>2005-08-08 15:26:53 +0000
commit062ed26b4d492e5327c5bd2dfabb6ec7b0875e6f (patch)
tree59607a3325aadffc59c3e0ddf72a13d36f91d491
parenta7e4057d2d581fc3d18da8c916669d632cca50b5 (diff)
downloadopenttd-062ed26b4d492e5327c5bd2dfabb6ec7b0875e6f.tar.xz
(svn r2842) Fix bug with aircraft autoreplace (peter1138)
-rw-r--r--aircraft_cmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index ddb074f71..d37b18e17 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -1530,7 +1530,7 @@ static void AircraftEventHandler_HeliTakeOff(Vehicle *v, const AirportFTAClass *
AircraftNextAirportPos_and_Order(v);
// check if the aircraft needs to be replaced or renewed and send it to a hangar if needed
- if ((v->owner == _local_player && p->engine_replacement[v->engine_type] != v->engine_type) ||
+ if ((v->owner == _local_player && p->engine_replacement[v->engine_type] != INVALID_ENGINE) ||
(v->owner == _local_player && p->engine_renew && v->age - v->max_age > (p->engine_renew_months * 30))) {
_current_player = _local_player;
DoCommandP(v->tile, v->index, 1, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR);
@@ -1593,7 +1593,7 @@ static void AircraftEventHandler_Landing(Vehicle *v, const AirportFTAClass *Airp
// 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 ((p->engine_replacement[v->engine_type] != v->engine_type) ||
+ if ((p->engine_replacement[v->engine_type] != INVALID_ENGINE) ||
(p->engine_renew && v->age - v->max_age > (p->engine_renew_months * 30))) {
// send the aircraft to the hangar at next airport (bit 17 set)
_current_player = _local_player;