(svn r12595) -Codechange: hide Order's flags in the last few cases.

This commit is contained in:
rubidium
2008-04-06 21:54:22 +00:00
parent c0a5fa9eea
commit d90a041230
3 changed files with 43 additions and 50 deletions

View File

@@ -91,22 +91,22 @@ static int GetOrderFromOrderWndPt(Window *w, int y, const Vehicle *v)
return (sel <= v->num_orders && sel >= 0) ? sel : INVALID_ORDER;
}
static StringID StationOrderStrings[] = {
STR_8806_GO_TO,
STR_GO_TO_TRANSFER,
STR_8807_GO_TO_UNLOAD,
STR_GO_TO_TRANSFER_UNLOAD,
STR_8808_GO_TO_LOAD,
STR_GO_TO_TRANSFER_LOAD,
STR_NULL,
STR_NULL,
STR_880A_GO_NON_STOP_TO,
STR_GO_TO_NON_STOP_TRANSFER,
STR_880B_GO_NON_STOP_TO_UNLOAD,
STR_GO_TO_NON_STOP_TRANSFER_UNLOAD,
STR_880C_GO_NON_STOP_TO_LOAD,
STR_GO_TO_NON_STOP_TRANSFER_LOAD,
STR_NULL
static StringID _station_order_strings[][7] = {
{
STR_8806_GO_TO,
STR_GO_TO_TRANSFER,
STR_8807_GO_TO_UNLOAD,
STR_GO_TO_TRANSFER_UNLOAD,
STR_8808_GO_TO_LOAD,
STR_GO_TO_TRANSFER_LOAD
}, {
STR_880A_GO_NON_STOP_TO,
STR_GO_TO_NON_STOP_TRANSFER,
STR_880B_GO_NON_STOP_TO_UNLOAD,
STR_GO_TO_NON_STOP_TRANSFER_UNLOAD,
STR_880C_GO_NON_STOP_TO_LOAD,
STR_GO_TO_NON_STOP_TRANSFER_LOAD
}
};
static void DrawOrdersWindow(Window *w)
@@ -201,7 +201,7 @@ static void DrawOrdersWindow(Window *w)
break;
case OT_GOTO_STATION:
SetDParam(1, StationOrderStrings[order->flags]);
SetDParam(1, _station_order_strings[!!order->GetNonStopType()][order->GetLoadType() | order->GetUnloadType()]);
SetDParam(2, order->GetDestination());
break;