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/vehicle.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/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d990d3d55..b181038bd 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -835,6 +835,8 @@ static void RunVehicleDayProc() if (callback != CALLBACK_FAILED) { if (HasBit(callback, 0)) TriggerVehicle(v, VEHICLE_TRIGGER_CALLBACK_32); // Trigger vehicle trigger 10 if (HasBit(callback, 1)) v->colourmap = PAL_NONE; + + if (callback & ~3) ErrorUnknownCallbackResult(v->GetGRFID(), CBID_VEHICLE_32DAY_CALLBACK, callback); } } @@ -2175,6 +2177,8 @@ void Vehicle::UpdateVisualEffect(bool allow_power_change) uint16 callback = GetVehicleCallback(CBID_VEHICLE_VISUAL_EFFECT, 0, 0, this->engine_type, this); if (callback != CALLBACK_FAILED) { + if (callback >= 0x100 && e->GetGRF()->grf_version >= 8) ErrorUnknownCallbackResult(e->GetGRFID(), CBID_VEHICLE_VISUAL_EFFECT, callback); + callback = GB(callback, 0, 8); /* Avoid accidentally setting 'visual_effect' to the default value * Since bit 6 (disable effects) is set anyways, we can safely erase some bits. */ |