summaryrefslogtreecommitdiff
path: root/src/newgrf_engine.cpp
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2010-11-06 13:05:11 +0000
committerterkhen <terkhen@openttd.org>2010-11-06 13:05:11 +0000
commit18e3a3ddfc7c9eee4d1023485a4c23b3cc40fbb3 (patch)
tree719e279d32005d7032a509a6aea06ab70124a667 /src/newgrf_engine.cpp
parent25d1b2f54b9cac01e2737848c208f6d8096a4a92 (diff)
downloadopenttd-18e3a3ddfc7c9eee4d1023485a4c23b3cc40fbb3.tar.xz
(svn r21099) -Codechange: Store road vehicle max speed in the vehicle cache.
Diffstat (limited to 'src/newgrf_engine.cpp')
-rw-r--r--src/newgrf_engine.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 04e71c8fb..5d5979cd9 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -717,17 +717,12 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
case 0x19: {
uint max_speed;
switch (v->type) {
- case VEH_TRAIN: /* FALL THROUGH */
- case VEH_SHIP:
- max_speed = v->vcache.cached_max_speed;
- break;
-
case VEH_AIRCRAFT:
max_speed = Aircraft::From(v)->GetSpeedOldUnits(); // Convert to old units.
break;
default:
- max_speed = v->max_speed;
+ max_speed = v->vcache.cached_max_speed;
break;
}
return (variable - 0x80) == 0x18 ? max_speed : GB(max_speed, 8, 8);