dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12593) -Codechange: hide Order's flags in most of the code.

Browse Source
This commit is contained in:
rubidium
2008-04-06 15:09:45 +00:00
parent e150643d31
commit 53d101cc99
17 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/order_gui.cpp
View File

@@ -215,14 +215,14 @@ static void DrawOrdersWindow(Window *w)
SetDParam(2, GetDepot(order->GetDestination())->town_index);
switch (v->type) {
case VEH_TRAIN: s = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
case VEH_TRAIN: s = (order->GetNonStopType() & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
case VEH_ROAD: s = STR_GO_TO_ROADVEH_DEPOT; break;
case VEH_SHIP: s = STR_GO_TO_SHIP_DEPOT; break;
default: break;
}
}
if (order->flags & OFB_FULL_LOAD) s++; /* service at */
if (order->GetDepotOrderType() & OFB_SERVICE_IF_NEEDED) s++; /* service at */
SetDParam(1, s);
if (order->IsRefit()) {
@@ -235,7 +235,7 @@ static void DrawOrdersWindow(Window *w)
}
case OT_GOTO_WAYPOINT:
SetDParam(1, (order->flags & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
SetDParam(1, (order->GetNonStopType() & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
SetDParam(2, order->GetDestination());
break;