Mercurial > hg > openttd

changeset 16403:7fe30adb500d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21119) -Fix: Helicopter flight altitude was determined inconsistently in different places.
author frosch <frosch@openttd.org>
date Mon, 08 Nov 2010 21:26:32 +0000
parents 04780d719725
children 499e5d11bc8d
files src/aircraft_cmd.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -626,6 +626,8 @@
  */
 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 @@
 			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) {