summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-03-28 18:43:01 +0000
committerrubidium <rubidium@openttd.org>2008-03-28 18:43:01 +0000
commitd51347a04dbcb89dadcb5e9fd5444068f2324755 (patch)
tree973f38f7556ea11a30a3600777562acd7c1272a0 /src
parent93d59fe4480116a100aa000f38cea9534fab9184 (diff)
downloadopenttd-d51347a04dbcb89dadcb5e9fd5444068f2324755.tar.xz
(svn r12477) -Fix [FS#1883]: timetable times for aircraft were always doubled.
Diffstat (limited to 'src')
-rw-r--r--src/aircraft_cmd.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 65654e1a2..625777e5d 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -2132,7 +2132,6 @@ static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc)
static void AircraftEventHandler(Vehicle *v, int loop)
{
v->tick_counter++;
- v->current_order_time++;
if (v->vehstatus & VS_CRASHED) {
HandleCrashedAircraft(v);
@@ -2169,6 +2168,8 @@ void Aircraft::Tick()
AgeAircraftCargo(this);
+ this->current_order_time++;
+
for (uint i = 0; i != 2; i++) {
AircraftEventHandler(this, i);
if (this->type != VEH_AIRCRAFT) // In case it was deleted