diff options
| author | smatz <smatz@openttd.org> | 2009-06-01 13:14:56 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-01 13:14:56 +0000 |
| commit | de25de7a60145d53d3faada9470d4f12589ab942 (patch) | |
| tree | 2ccc3c4dc4df30dbb211b3bd75b37bfebf890620 /src/train.h | |
| parent | 765c65b738c3ec956aad5faaaa8fef388fe68ddf (diff) | |
| download | openttd-de25de7a60145d53d3faada9470d4f12589ab942.tar.xz | |
(svn r16494) -Codechange: cache train's speed limit caused by curves
Diffstat (limited to 'src/train.h')
| -rw-r--r-- | src/train.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/train.h b/src/train.h index c1f9f120d..bcf005472 100644 --- a/src/train.h +++ b/src/train.h @@ -257,6 +257,7 @@ int GetTrainStopLocation(StationID station_id, TileIndex tile, const Train *v, i void TrainConsistChanged(Train *v, bool same_length); void TrainPowerChanged(Train *v); +int GetTrainCurveSpeedLimit(Train *v); Money GetTrainRunningCost(const Train *v); /** Variables that are cached to improve performance and such */ @@ -268,7 +269,6 @@ struct TrainCache { /* cached values, recalculated on load and each time a vehicle is added to/removed from the consist. */ uint32 cached_power; ///< total power of the consist. - uint16 cached_max_speed; ///< max speed of the consist. (minimum of the max speed of all vehicles in the consist) uint16 cached_total_length; ///< Length of the whole train, valid only for first engine. uint8 cached_veh_length; ///< length of this vehicle in units of 1/8 of normal length, cached because this can be set by a callback bool cached_tilt; ///< train can tilt; feature provides a bonus in curves @@ -278,6 +278,10 @@ struct TrainCache { uint32 cached_veh_weight; ///< weight of the vehicle. uint32 cached_max_te; ///< max tractive effort of consist + /* cached max. speed / acceleration data */ + uint16 cached_max_speed; ///< max speed of the consist. (minimum of the max speed of all vehicles in the consist) + int cached_max_curve_speed; ///< max consist speed limited by curves + /** * Position/type of visual effect. * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear) |