(svn r12477) -Fix [FS#1883]: timetable times for aircraft were always doubled.
authorrubidium
Fri, 28 Mar 2008 18:43:01 +0000
changeset 9274 ea5aab96fdcc
parent 9273 ca5e00698c01
child 9275 779760004b6b
(svn r12477) -Fix [FS#1883]: timetable times for aircraft were always doubled.
src/aircraft_cmd.cpp
--- a/src/aircraft_cmd.cpp	Fri Mar 28 18:00:38 2008 +0000
+++ b/src/aircraft_cmd.cpp	Fri Mar 28 18:43:01 2008 +0000
@@ -2132,7 +2132,6 @@
 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 @@
 
 	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