summaryrefslogtreecommitdiff
path: root/src/ship.h
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-05-14 19:56:49 +0000
committermichi_cc <michi_cc@openttd.org>2012-05-14 19:56:49 +0000
commitce5c936b07517955ffa29a134907346b6cd4c148 (patch)
tree204c818783cda0baf6104f72e7897f5c311f0e3b /src/ship.h
parent58d474797e90fbc551a455000cfbda16f15ad4a5 (diff)
downloadopenttd-ce5c936b07517955ffa29a134907346b6cd4c148.tar.xz
(svn r24246) -Add [FS#5052-ish]: [NewGRF] Variable with the current max speed for vehicles.
Diffstat (limited to 'src/ship.h')
-rw-r--r--src/ship.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ship.h b/src/ship.h
index 6096ae055..e471e7fb1 100644
--- a/src/ship.h
+++ b/src/ship.h
@@ -37,6 +37,7 @@ struct Ship FINAL : public SpecializedVehicle<Ship, VEH_SHIP> {
SpriteID GetImage(Direction direction, EngineImageType image_type) const;
int GetDisplaySpeed() const { return this->cur_speed / 2; }
int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed / 2; }
+ int GetCurrentMaxSpeed() const { return min(this->vcache.cached_max_speed, this->current_order.max_speed * 2); }
Money GetRunningCost() const;
bool IsInDepot() const { return this->state == TRACK_BIT_DEPOT; }
bool Tick();