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 /ship_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 'ship_gui.c')
-rw-r--r-- | ship_gui.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ship_gui.c b/ship_gui.c index 842a57c0f..bcaa8869d 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -490,7 +490,11 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) Depot *depot = GetDepot(v->current_order.dest.depot); SetDParam(0, depot->town_index); SetDParam(1, v->cur_speed / 2); - str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed; + if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) { + str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed; + } else { + str = STR_HEADING_FOR_SHIP_DEPOT_SERVICE + _patches.vehicle_speed; + } } break; case OT_LOADING: @@ -526,7 +530,7 @@ static void ShipViewWndProc(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_SHIP_TO_DEPOT | CMD_MSG(STR_9819_CAN_T_SEND_SHIP_TO_DEPOT)); + DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_SEND_SHIP_TO_DEPOT | CMD_MSG(STR_9819_CAN_T_SEND_SHIP_TO_DEPOT)); break; case 8: /* refit */ ShowShipRefitWindow(v); |