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 /aircraft_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 'aircraft_gui.c')
| -rw-r--r-- | aircraft_gui.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/aircraft_gui.c b/aircraft_gui.c index bca31d971..75a7a332b 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -557,7 +557,7 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e) /* Aircrafts always go to a station, even if you say depot */ SetDParam(0, v->current_order.dest); SetDParam(1, v->cur_speed * 128 / 10); - 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_HANGAR + _patches.vehicle_speed; } else { str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed; |