summaryrefslogtreecommitdiff
path: root/src/roadveh_cmd.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2011-11-08 17:27:46 +0000
committerfrosch <frosch@openttd.org>2011-11-08 17:27:46 +0000
commitc2cf26b451bf93dde6730b950b9face513d5accc (patch)
tree154b76da04f09f97f5998c3ce47db4e16cbdd1b5 /src/roadveh_cmd.cpp
parent52774235eb6eb8affb7e68b94c490d3f09e7ae31 (diff)
downloadopenttd-c2cf26b451bf93dde6730b950b9face513d5accc.tar.xz
(svn r23149) -Add: [NewGRF] Road vehicle property 23 to shorten vehicles without callback usage.
Diffstat (limited to 'src/roadveh_cmd.cpp')
-rw-r--r--src/roadveh_cmd.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index e6198bbc0..6754874ea 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -161,11 +161,12 @@ void DrawRoadVehEngine(int left, int right, int preferred_x, int y, EngineID eng
*/
static uint GetRoadVehLength(const RoadVehicle *v)
{
- uint length = VEHICLE_LENGTH;
+ const Engine *e = v->GetEngine();
+ uint length = e->u.road.shorten_factor;
uint16 veh_len = GetVehicleCallback(CBID_VEHICLE_LENGTH, 0, 0, v->engine_type, v);
if (veh_len != CALLBACK_FAILED) {
- if (veh_len >= VEHICLE_LENGTH) ErrorUnknownCallbackResult(v->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len);
+ if (veh_len >= VEHICLE_LENGTH) ErrorUnknownCallbackResult(e->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len);
length -= Clamp(veh_len, 0, VEHICLE_LENGTH - 1);
}