gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-23 15:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2842) Fix bug with aircraft autoreplace (peter1138)

Browse Source
This commit is contained in:
ludde 2005-08-08 15:26:53 +00:00
parent a7e4057d2d
commit 062ed26b4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aircraft_cmd.c
View File

@ -1530,7 +1530,7 @@ static void AircraftEventHandler_HeliTakeOff(Vehicle *v, const AirportFTAClass *
AircraftNextAirportPos_and_Order(v); AircraftNextAirportPos_and_Order(v);
// check if the aircraft needs to be replaced or renewed and send it to a hangar if needed // 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))) { (v->owner == _local_player && p->engine_renew && v->age - v->max_age > (p->engine_renew_months * 30))) {
_current_player = _local_player; _current_player = _local_player;
DoCommandP(v->tile, v->index, 1, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_SHOW_NO_ERROR); 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 // 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) { if (v->current_order.type != OT_GOTO_DEPOT && v->owner == _local_player) {
// only the vehicle owner needs to calculate the rest (locally) // 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))) { (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) // send the aircraft to the hangar at next airport (bit 17 set)
_current_player = _local_player; _current_player = _local_player;