diff options
| author | frosch <frosch@openttd.org> | 2011-11-08 17:27:13 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-11-08 17:27:13 +0000 |
| commit | 52774235eb6eb8affb7e68b94c490d3f09e7ae31 (patch) | |
| tree | af07d5b6df28b5c9fdcef94e0f67ecec290e1764 /src/train_cmd.cpp | |
| parent | 30874b5e81af0fff2f42d34b9b105ee86666b8ac (diff) | |
| download | openttd-52774235eb6eb8affb7e68b94c490d3f09e7ae31.tar.xz | |
(svn r23148) -Change: [NewGRF] Check the results of various callbacks for validness.
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 3bcfcc64a..bc7898667 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -223,6 +223,10 @@ void Train::ConsistChanged(bool same_length) uint16 veh_len = CALLBACK_FAILED; if (HasBit(e_u->info.callback_mask, CBM_VEHICLE_LENGTH)) { 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 = rvi_u->shorten_factor; veh_len = VEHICLE_LENGTH - Clamp(veh_len, 0, VEHICLE_LENGTH - 1); |