gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-21 20:49:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r6497) -Fix r6165: Vehicles heading for depots when their orders contained "service in depot" displayed the stopping in depot string

Browse Source 
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
This commit is contained in:
bjarni 2006-09-22 23:13:12 +00:00
parent bae85177d4
commit 0f78b620fb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aircraft_gui.c
View File

@ -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;

2
roadveh_gui.c
View File

@ -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;

2
ship_gui.c
View File

@ -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;

2
train_gui.c
View File

@ -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;