summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2010-11-06 13:11:24 +0000
committerterkhen <terkhen@openttd.org>2010-11-06 13:11:24 +0000
commitb65df931216207038d3560141166f2547041e18a (patch)
treec45d888fd72b967e8e4ec92142b9683d8e69c21c /src/engine.cpp
parent18e3a3ddfc7c9eee4d1023485a4c23b3cc40fbb3 (diff)
downloadopenttd-b65df931216207038d3560141166f2547041e18a.tar.xz
(svn r21100) -Feature [NewGRF]: Add CB36 support for road vehicle property 0x15 (Speed).
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index 55358b63f..3c6ae964c 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -294,8 +294,10 @@ uint Engine::GetDisplayMaxSpeed() const
case VEH_TRAIN:
return GetEngineProperty(this->index, PROP_TRAIN_SPEED, this->u.rail.max_speed);
- case VEH_ROAD:
- return this->u.road.max_speed / 2;
+ case VEH_ROAD: {
+ uint max_speed = GetEngineProperty(this->index, PROP_ROADVEH_SPEED, 0);
+ return (max_speed != 0) ? max_speed * 2 : this->u.road.max_speed / 2;
+ }
case VEH_SHIP:
return GetEngineProperty(this->index, PROP_SHIP_SPEED, this->u.ship.max_speed) / 2;