diff options
| author | fonsinchen <fonsinchen@openttd.org> | 2014-05-01 14:48:44 +0000 |
|---|---|---|
| committer | fonsinchen <fonsinchen@openttd.org> | 2014-05-01 14:48:44 +0000 |
| commit | c915d9fa55e8bb42b33c56b94c5a5e0ff446d7da (patch) | |
| tree | d908c9f08f9ba22552bb21121936e5d279e00c4b /src/ship.h | |
| parent | 4ef537ba338c44a84b4defcce5aa24554edcde22 (diff) | |
| download | openttd-c915d9fa55e8bb42b33c56b94c5a5e0ff446d7da.tar.xz | |
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
Diffstat (limited to 'src/ship.h')
| -rw-r--r-- | src/ship.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ship.h b/src/ship.h index 29f4439d4..18f04c8fa 100644 --- a/src/ship.h +++ b/src/ship.h @@ -37,7 +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); } + int GetCurrentMaxSpeed() const { return min(this->vcache.cached_max_speed, this->current_order.GetMaxSpeed() * 2); } Money GetRunningCost() const; bool IsInDepot() const { return this->state == TRACK_BIT_DEPOT; } bool Tick(); |