summaryrefslogtreecommitdiff
path: root/src/vehicle.cpp
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2010-12-14 21:33:53 +0000
committerterkhen <terkhen@openttd.org>2010-12-14 21:33:53 +0000
commit48b7916458de4b2cdbc226a4a6ab078db4c77e73 (patch)
treec3a49ca7a91890042ca56765574bc40a54c15f96 /src/vehicle.cpp
parenta93944e765776c6e9a2bd556457cd93748068da6 (diff)
downloadopenttd-48b7916458de4b2cdbc226a4a6ab078db4c77e73.tar.xz
(svn r21521) -Codechange: Unify some cached values that were present in both road vehicles and trains.
Diffstat (limited to 'src/vehicle.cpp')
-rw-r--r--src/vehicle.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index d3b47c7e3..cb915a6f7 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1665,10 +1665,8 @@ PaletteID GetEnginePalette(EngineID engine_type, CompanyID company)
PaletteID GetVehiclePalette(const Vehicle *v)
{
- if (v->type == VEH_TRAIN) {
- return GetEngineColourMap(v->engine_type, v->owner, Train::From(v)->tcache.first_engine, v);
- } else if (v->type == VEH_ROAD) {
- return GetEngineColourMap(v->engine_type, v->owner, RoadVehicle::From(v)->rcache.first_engine, v);
+ if (v->IsGroundVehicle()) {
+ return GetEngineColourMap(v->engine_type, v->owner, v->GetGroundVehicleCache()->first_engine, v);
}
return GetEngineColourMap(v->engine_type, v->owner, INVALID_ENGINE, v);