diff options
author | rubidium <rubidium@openttd.org> | 2011-11-04 13:40:59 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-11-04 13:40:59 +0000 |
commit | 9782b7bb0af914d749b125c3a0ae56cccc99c8e3 (patch) | |
tree | 3c96c798077d2903e39a390e2d7e79c7b2e6e836 /src/aircraft_cmd.cpp | |
parent | 81f583de4775858ec78b66b4e9bea6ce9952c5b9 (diff) | |
download | openttd-9782b7bb0af914d749b125c3a0ae56cccc99c8e3.tar.xz |
(svn r23110) -Codechange: let the flying altitude return ints are well
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index e259bcbc3..7308392d2 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -630,14 +630,14 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE, * @param v The vehicle. Should be an aircraft * @returns Altitude in pixel units */ -byte GetAircraftFlyingAltitude(const Aircraft *v) +int 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) */ - byte base_altitude = PLANE_HOLDING_ALTITUDE; + int base_altitude = PLANE_HOLDING_ALTITUDE; /* Make sure eastbound and westbound planes do not "crash" into each * other by providing them with vertical seperation @@ -776,7 +776,7 @@ static bool AircraftController(Aircraft *v) count = UpdateAircraftSpeed(v); if (count > 0) { v->tile = 0; - byte z_dest = GetAircraftFlyingAltitude(v); + int z_dest = GetAircraftFlyingAltitude(v); /* Reached altitude? */ if (v->z_pos >= z_dest) { |