diff options
author | bjarni <bjarni@openttd.org> | 2006-09-22 23:13:12 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2006-09-22 23:13:12 +0000 |
commit | 0f78b620fbb4e4ca744ceffffc43a9c0846bca12 (patch) | |
tree | c38e8a4f6323c29606c2e5cde3606e29221532db /ship_gui.c | |
parent | bae85177d49fa50ff1d9c49ebee879f8de762191 (diff) | |
download | openttd-0f78b620fbb4e4ca744ceffffc43a9c0846bca12.tar.xz |
(svn r6497) -Fix r6165: Vehicles heading for depots when their orders contained "service in depot" displayed the stopping in depot string
This turned out to be due to OFB_HALT_IN_DEPOT and OFB_SERVICE_IF_NEEDED using the same bit
It appears that it doesn't matter for the code, so I adapted the string selection code to handle this
Diffstat (limited to 'ship_gui.c')
-rw-r--r-- | ship_gui.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ship_gui.c b/ship_gui.c index 75374c3c7..9b31190c2 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -484,7 +484,7 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) Depot *depot = GetDepot(v->current_order.dest); SetDParam(0, depot->town_index); SetDParam(1, v->cur_speed / 2); - if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) { + if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) { str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed; } else { str = STR_HEADING_FOR_SHIP_DEPOT_SERVICE + _patches.vehicle_speed; |