mirror of https://github.com/OpenTTD/OpenTTD
(svn r12477) -Fix [FS#1883]: timetable times for aircraft were always doubled.
parent
93d59fe448
commit
d51347a04d
|
@ -2132,7 +2132,6 @@ static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc)
|
||||||
static void AircraftEventHandler(Vehicle *v, int loop)
|
static void AircraftEventHandler(Vehicle *v, int loop)
|
||||||
{
|
{
|
||||||
v->tick_counter++;
|
v->tick_counter++;
|
||||||
v->current_order_time++;
|
|
||||||
|
|
||||||
if (v->vehstatus & VS_CRASHED) {
|
if (v->vehstatus & VS_CRASHED) {
|
||||||
HandleCrashedAircraft(v);
|
HandleCrashedAircraft(v);
|
||||||
|
@ -2169,6 +2168,8 @@ void Aircraft::Tick()
|
||||||
|
|
||||||
AgeAircraftCargo(this);
|
AgeAircraftCargo(this);
|
||||||
|
|
||||||
|
this->current_order_time++;
|
||||||
|
|
||||||
for (uint i = 0; i != 2; i++) {
|
for (uint i = 0; i != 2; i++) {
|
||||||
AircraftEventHandler(this, i);
|
AircraftEventHandler(this, i);
|
||||||
if (this->type != VEH_AIRCRAFT) // In case it was deleted
|
if (this->type != VEH_AIRCRAFT) // In case it was deleted
|
||||||
|
|
Loading…
Reference in New Issue