diff options
| author | bjarni <bjarni@openttd.org> | 2006-09-01 12:37:03 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-09-01 12:37:03 +0000 |
| commit | 26c10adbfce56a9f664d54ba91937846605ee241 (patch) | |
| tree | 49dc91f6886b9cc2c0c55365e6d1c77e5e9b9bbd /ship_cmd.c | |
| parent | 168e2b41e5e6e5e0ff79a9f09209dce4e02e2d13 (diff) | |
| download | openttd-26c10adbfce56a9f664d54ba91937846605ee241.tar.xz | |
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
Diffstat (limited to 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index d81b02caa..87faf037c 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -1020,6 +1020,17 @@ int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* If the current orders are already goto-depot */ if (v->current_order.type == OT_GOTO_DEPOT) { + if ((p2 & DEPOT_SERVICE) == (bool)HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) { + /* We called with a different DEPOT_SERVICE setting. + * Now we change the setting to apply the new one and let the vehicle head for the same depot. + * Note: the if is (true for requesting service == true for ordered to stop in depot) */ + if (flags & DC_EXEC) { + TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); + InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); + } + return 0; + } + if (p2 & DEPOT_DONT_CANCEL) return CMD_ERROR; // Requested no cancelation of depot orders if (flags & DC_EXEC) { /* If the orders to 'goto depot' are in the orders list (forced servicing), |