diff options
| author | rubidium <rubidium@openttd.org> | 2007-09-09 17:42:59 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-09-09 17:42:59 +0000 |
| commit | 38ff181ebf2e6baa1dfa41828b407bea488c2fa0 (patch) | |
| tree | 83d96706871a483f8690cebff3fd9febc2f2b901 | |
| parent | 384bfae293f3d3eb99d5889713aace42dc793a38 (diff) | |
| download | openttd-38ff181ebf2e6baa1dfa41828b407bea488c2fa0.tar.xz | |
(svn r11072) -Fix [FS#1045]: when a vehicle had a service order, the goto-depot button did not make it possible to stop the vehicle at that depot.
| -rw-r--r-- | src/aircraft_cmd.cpp | 1 | ||||
| -rw-r--r-- | src/roadveh_cmd.cpp | 1 | ||||
| -rw-r--r-- | src/ship_cmd.cpp | 1 | ||||
| -rw-r--r-- | src/train_cmd.cpp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index db22fbd0a..97a91f371 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -568,6 +568,7 @@ CommandCost CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uin * Now we change the setting to apply the new one and let the vehicle head for the same hangar. * Note: the if is (true for requesting service == true for ordered to stop in hangar) */ if (flags & DC_EXEC) { + CLRBIT(v->current_order.flags, OFB_PART_OF_ORDERS); TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 4869ed714..7e46f9de6 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -477,6 +477,7 @@ CommandCost CmdSendRoadVehToDepot(TileIndex tile, uint32 flags, uint32 p1, uint3 * 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) { + CLRBIT(v->current_order.flags, OFB_PART_OF_ORDERS); TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 67e358d41..c3251e33f 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -1004,6 +1004,7 @@ CommandCost CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p * 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) { + CLRBIT(v->current_order.flags, OFB_PART_OF_ORDERS); TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index f850f7c42..a320628a9 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1893,6 +1893,7 @@ CommandCost CmdSendTrainToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 * 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) { + CLRBIT(v->current_order.flags, OFB_PART_OF_ORDERS); TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } |