petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3239) - Codechange: Introduce and use helper functions for engine replacement code.

Browse Source
This commit is contained in:
peter1138
2005-11-26 16:41:14 +00:00
parent 9a381f4d5d
commit 87f54ebf92
6 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aircraft_cmd.c
View File

@@ -1469,7 +1469,7 @@ static void AircraftEventHandler_HeliTakeOff(Vehicle *v, const AirportFTAClass *
// 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] != INVALID_ENGINE ||
EngineHasReplacement(p, v->engine_type) ||
(p->engine_renew && v->age - v->max_age > p->engine_renew_months * 30)
)) {
_current_player = _local_player;
@@ -1533,7 +1533,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] != INVALID_ENGINE) ||
if (EngineHasReplacement(p, v->engine_type) ||
(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;