cpp/openttd-patchpack/source Changeset - r16370:3248b10e72ee

Changeset - r16370:3248b10e72ee

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

terkhen - 14 years ago 2010-11-06 12:50:34
terkhen@openttd.org

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

3 files changed with 7 insertions and 4 deletions:

src/aircraft.h

src/aircraft_cmd.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/aircraft.h

➞

Show inline comments

@@ @@ -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();

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -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;
+}

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -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;
+	}

0 comments (0 inline, 0 general)