diff options
| author | bjarni <bjarni@openttd.org> | 2006-08-27 09:28:52 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-08-27 09:28:52 +0000 |
| commit | 6cbd4cc167c31b71bc833449c7322b2b42d4fdfc (patch) | |
| tree | 585e4dad61b4e846d7d84cbb77843c694b54e278 /aircraft_gui.c | |
| parent | d3096b84fdab85a0688eff8f3a6d1d2618d3162d (diff) | |
| download | openttd-6cbd4cc167c31b71bc833449c7322b2b42d4fdfc.tar.xz | |
(svn r6165) -Feature: control click Goto Depot will now make the vehicle service
at the depot and leave right away.
To tell the difference the status of stopping vehicles will be in red,
while servicing vehicles will be green.
-Codechange: remove some dead code in CmdSendAircraftToHangar() since it is
conflicting with new functionality. Now p2 means the same for all types
Diffstat (limited to 'aircraft_gui.c')
| -rw-r--r-- | aircraft_gui.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/aircraft_gui.c b/aircraft_gui.c index 4134a2e89..05fc7cd83 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -557,7 +557,11 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e) /* Aircrafts always go to a station, even if you say depot */ SetDParam(0, v->current_order.dest.station); SetDParam(1, v->cur_speed * 128 / 10); - str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed; + if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) { + str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed; + } else { + str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed; + } } break; case OT_LOADING: @@ -592,7 +596,7 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e) ScrollMainWindowTo(v->x_pos, v->y_pos); break; case 7: /* goto hangar */ - DoCommandP(v->tile, v->index, 0, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_MSG(STR_A012_CAN_T_SEND_AIRCRAFT_TO)); + DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_MSG(STR_A012_CAN_T_SEND_AIRCRAFT_TO)); break; case 8: /* refit */ ShowAircraftRefitWindow(v); |