diff options
author | frosch <frosch@openttd.org> | 2011-11-08 17:24:43 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2011-11-08 17:24:43 +0000 |
commit | d8f8909f859eb900ceaf8897537b2f46d970b308 (patch) | |
tree | 6a7c1eec6508195356926d1859b78305f959aafb /src/build_vehicle_gui.cpp | |
parent | cd029465e1d6413453cb16224d5000fa9689fa79 (diff) | |
download | openttd-d8f8909f859eb900ceaf8897537b2f46d970b308.tar.xz |
(svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts.
Diffstat (limited to 'src/build_vehicle_gui.cpp')
-rw-r--r-- | src/build_vehicle_gui.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index e68dc8ccb..91e32d425 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -753,7 +753,11 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_ static uint ShowAdditionalText(int left, int right, int y, EngineID engine) { uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL); - if (callback == CALLBACK_FAILED) return y; + if (callback == CALLBACK_FAILED || callback == 0x400) return y; + if (callback > 0x400) { + ErrorUnknownCallbackResult(Engine::Get(engine)->GetGRFID(), CBID_VEHICLE_ADDITIONAL_TEXT, callback); + return y; + } StartTextRefStackUsage(6); uint result = DrawStringMultiLine(left, right, y, INT32_MAX, GetGRFStringID(Engine::Get(engine)->GetGRFID(), 0xD000 + callback), TC_BLACK); |