diff options
| author | frosch <frosch@openttd.org> | 2011-11-08 17:27:55 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-11-08 17:27:55 +0000 |
| commit | 8dcbd673cfa9e9f1f4036fe053a9ebd78bb0328a (patch) | |
| tree | 9bdef9a4fe800d233ac0750d3ee76a22169edca3 /src/roadveh_cmd.cpp | |
| parent | c2cf26b451bf93dde6730b950b9face513d5accc (diff) | |
| download | openttd-8dcbd673cfa9e9f1f4036fe053a9ebd78bb0328a.tar.xz | |
(svn r23150) -Change: [NewGRF v8] Deprecate callback 11, and use callback 36 instead.
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 6754874ea..e48cbb349 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -34,6 +34,7 @@ #include "core/random_func.hpp" #include "company_base.h" #include "core/backup_type.hpp" +#include "newgrf.h" #include "table/strings.h" @@ -164,7 +165,14 @@ static uint GetRoadVehLength(const RoadVehicle *v) 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); + uint16 veh_len = CALLBACK_FAILED; + if (e->GetGRF() != NULL && e->GetGRF()->grf_version >= 8) { + /* Use callback 36 */ + veh_len = GetVehicleProperty(v, PROP_ROADVEH_SHORTEN_FACTOR, CALLBACK_FAILED); + } else { + /* Use callback 11 */ + veh_len = GetVehicleCallback(CBID_VEHICLE_LENGTH, 0, 0, v->engine_type, v); + } if (veh_len != CALLBACK_FAILED) { if (veh_len >= VEHICLE_LENGTH) ErrorUnknownCallbackResult(e->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len); length -= Clamp(veh_len, 0, VEHICLE_LENGTH - 1); |