# HG changeset patch
# User terkhen <terkhen@openttd.org>
# Date 2010-11-06 12:50:34
# Node ID 3248b10e72ee3d77d251f35a80b9cd2453d90204
# Parent  b31b2430ee546741d6a1fc707d19cd637b48e72b

(svn r21096) -Fix: Display the real max speed for aircrafts instead of always using the engine value.

diff --git a/src/aircraft.h b/src/aircraft.h
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -90,8 +90,8 @@ struct Aircraft : public SpecializedVehi
 	bool IsPrimaryVehicle() const                  { return this->IsNormalAircraft(); }
 	SpriteID GetImage(Direction direction) const;
 	int GetDisplaySpeed() const    { return this->cur_speed; }
-	int GetDisplayMaxSpeed() const { return this->max_speed; }
-	int GetSpeedOldUnits() const   { return this->max_speed * 10 / 128; }
+	int GetDisplayMaxSpeed() const { return this->acache.cached_max_speed; }
+	int GetSpeedOldUnits() const   { return this->acache.cached_max_speed * 10 / 128; }
 	Money GetRunningCost() const;
 	bool IsInDepot() const { return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile); }
 	bool Tick();
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -537,7 +537,8 @@ void UpdateAircraftCache(Aircraft *v)
 
 		v->acache.cached_max_speed = max_speed;
 	} else {
-		v->acache.cached_max_speed = 0xFFFF;
+		/* Use the default max speed of the vehicle. */
+		v->acache.cached_max_speed = v->max_speed;
 	}
 }
 
@@ -639,7 +640,7 @@ byte GetAircraftFlyingAltitude(const Air
 	}
 
 	/* Make faster planes fly higher so that they can overtake slower ones */
-	base_altitude += min(20 * (v->max_speed / 200), 90);
+	base_altitude += min(20 * (v->acache.cached_max_speed / 200), 90);
 
 	return base_altitude;
 }
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -809,6 +809,8 @@ static int CDECL VehicleMaxSpeedSorter(c
 	int r = 0;
 	if ((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) {
 		r = Train::From(*a)->tcache.cached_max_speed - Train::From(*b)->tcache.cached_max_speed;
+	} if ((*a)->type == VEH_AIRCRAFT && (*b)->type == VEH_AIRCRAFT) {
+		r = Aircraft::From(*a)->acache.cached_max_speed - Aircraft::From(*b)->acache.cached_max_speed;
 	} else {
 		r = (*a)->max_speed - (*b)->max_speed;
 	}