From f2c694c8fbfb775dc239ab1c6447d3744d1c84c7 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Tue, 14 Feb 2012 17:04:06 +0000 Subject: (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. --- src/roadveh_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/roadveh_cmd.cpp') diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 0c0157ab1..6a8225050 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -416,7 +416,7 @@ void RoadVehicle::UpdateDeltaXY(Direction direction) */ inline int RoadVehicle::GetCurrentMaxSpeed() const { - if (_settings_game.vehicle.roadveh_acceleration_model == AM_ORIGINAL) return this->vcache.cached_max_speed; + if (_settings_game.vehicle.roadveh_acceleration_model == AM_ORIGINAL) return min(this->vcache.cached_max_speed, this->current_order.max_speed * 2); int max_speed = this->vcache.cached_max_speed; @@ -430,7 +430,7 @@ inline int RoadVehicle::GetCurrentMaxSpeed() const } } - return max_speed; + return min(max_speed, this->current_order.max_speed * 2); } /** -- cgit v1.2.3-54-g00ecf