From b1765482d25751f216bcb01c61ed07d290e4eb26 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Mon, 8 Nov 2010 21:26:32 +0000
Subject: [PATCH] (svn r21119) -Fix: Helicopter flight altitude was determined
 inconsistently in different places.

---
 src/aircraft_cmd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 597bb7ab57..066fe6a8c8 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -626,6 +626,8 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
  */
 byte GetAircraftFlyingAltitude(const Aircraft *v)
 {
+	if (v->subtype == AIR_HELICOPTER) return HELI_FLIGHT_ALTITUDE;
+
 	/* Make sure Aircraft fly no lower so that they don't conduct
 	 * CFITs (controlled flight into terrain)
 	 */
@@ -768,7 +770,7 @@ static bool AircraftController(Aircraft *v)
 			count = UpdateAircraftSpeed(v);
 			if (count > 0) {
 				v->tile = 0;
-				byte z_dest = HELI_FLIGHT_ALTITUDE;
+				byte z_dest = GetAircraftFlyingAltitude(v);
 
 				/* Reached altitude? */
 				if (v->z_pos >= z_dest) {