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/train_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/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index bc7898667..94921a3eb 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -221,12 +221,15 @@ void Train::ConsistChanged(bool same_length) /* check the vehicle length (callback) */ uint16 veh_len = CALLBACK_FAILED; - if (HasBit(e_u->info.callback_mask, CBM_VEHICLE_LENGTH)) { + if (e_u->GetGRF() != NULL && e_u->GetGRF()->grf_version >= 8) { + /* Use callback 36 */ + veh_len = GetVehicleProperty(u, PROP_TRAIN_SHORTEN_FACTOR, CALLBACK_FAILED); + } else if (HasBit(e_u->info.callback_mask, CBM_VEHICLE_LENGTH)) { + /* Use callback 11 */ veh_len = GetVehicleCallback(CBID_VEHICLE_LENGTH, 0, 0, u->engine_type, u); - - if (veh_len != CALLBACK_FAILED && veh_len >= VEHICLE_LENGTH) { - ErrorUnknownCallbackResult(e_u->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len); - } + } + if (veh_len != CALLBACK_FAILED && veh_len >= VEHICLE_LENGTH) { + ErrorUnknownCallbackResult(e_u->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len); } if (veh_len == CALLBACK_FAILED) veh_len = rvi_u->shorten_factor; veh_len = VEHICLE_LENGTH - Clamp(veh_len, 0, VEHICLE_LENGTH - 1); |