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 | e20c8be1722ab9d1aa23b3b8bfb8207628f8322e (patch) | |
| tree | c38e8a4f6323c29606c2e5cde3606e29221532db | |
| parent | f03975c251caff6d6ea846eeaeb6a2fa1b8414a7 (diff) | |
| download | openttd-e20c8be1722ab9d1aa23b3b8bfb8207628f8322e.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
| -rw-r--r-- | aircraft_gui.c | 2 | ||||
| -rw-r--r-- | roadveh_gui.c | 2 | ||||
| -rw-r--r-- | ship_gui.c | 2 | ||||
| -rw-r--r-- | train_gui.c | 2 |
4 files changed, 4 insertions, 4 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; diff --git a/roadveh_gui.c b/roadveh_gui.c index 47df5cdc4..7c85142cf 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -343,7 +343,7 @@ static void RoadVehViewWndProc(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_ROAD_DEPOT + _patches.vehicle_speed; } else { str = STR_HEADING_FOR_ROAD_DEPOT_SERVICE + _patches.vehicle_speed; 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; diff --git a/train_gui.c b/train_gui.c index 3dfc86e84..d1266cbcd 100644 --- a/train_gui.c +++ b/train_gui.c @@ -974,7 +974,7 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) case OT_GOTO_DEPOT: { Depot *dep = GetDepot(v->current_order.dest); SetDParam(0, dep->town_index); - 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_TRAIN_DEPOT + _patches.vehicle_speed; } else { str = STR_HEADING_FOR_TRAIN_DEPOT_SERVICE + _patches.vehicle_speed; |