diff options
| author | bjarni <bjarni@openttd.org> | 2006-08-21 16:35:47 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-08-21 16:35:47 +0000 |
| commit | 0663fdfc1a50d3a333d4c6157bdf4b41cd9ee2c0 (patch) | |
| tree | 4485529e1be1be076e6acae80cbe226e13e35c6d /aircraft_cmd.c | |
| parent | 2849e4fea984d541699d8bf4cee5d46086c5fe9a (diff) | |
| download | openttd-0663fdfc1a50d3a333d4c6157bdf4b41cd9ee2c0.tar.xz | |
(svn r6039) -Fix: [newGRF] FS#287 Bugfix for error in NewGRF callback 31 code for aircraft (Mart3p)
introduced in rev 5822
Diffstat (limited to 'aircraft_cmd.c')
| -rw-r--r-- | aircraft_cmd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 0f2fc2f93..5cbc503ec 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -425,7 +425,6 @@ static void DoDeleteAircraft(Vehicle *v) int32 CmdSellAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; - uint16 callback; if (!IsVehicleIndex(p1)) return CMD_ERROR; @@ -436,14 +435,6 @@ int32 CmdSellAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); - /* Check if this aircraft can be started/stopped. The callback will fail or - * return 0xFF if it can. */ - callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v); - if (callback != CALLBACK_FAILED && callback != 0xFF) { - StringID error = GetGRFStringID(GetEngineGRFID(v->engine_type), 0xD000 + callback); - return_cmd_error(error); - } - if (flags & DC_EXEC) { // Invalidate depot InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); @@ -463,6 +454,7 @@ int32 CmdSellAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 CmdStartStopAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; + uint16 callback; if (!IsVehicleIndex(p1)) return CMD_ERROR; @@ -474,6 +466,14 @@ int32 CmdStartStopAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (v->u.air.state >= STARTTAKEOFF && v->u.air.state < TERM7) return_cmd_error(STR_A017_AIRCRAFT_IS_IN_FLIGHT); + /* Check if this aircraft can be started/stopped. The callback will fail or + * return 0xFF if it can. */ + callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v); + if (callback != CALLBACK_FAILED && callback != 0xFF) { + StringID error = GetGRFStringID(GetEngineGRFID(v->engine_type), 0xD000 + callback); + return_cmd_error(error); + } + if (flags & DC_EXEC) { if (IsAircraftInHangarStopped(v)) { DeleteVehicleNews(p1, STR_A014_AIRCRAFT_IS_WAITING_IN); |