(svn r11994) -Codechange: Remove numbers from string names where the strings aren't present in TTD, since they don't correspond to either TTD's TextIDs or OpenTTD's StringIDs.
This commit is contained in:
@@ -93,19 +93,19 @@ static int GetOrderFromOrderWndPt(Window *w, int y, const Vehicle *v)
|
||||
|
||||
static StringID StationOrderStrings[] = {
|
||||
STR_8806_GO_TO,
|
||||
STR_8807_GO_TO_TRANSFER,
|
||||
STR_8808_GO_TO_UNLOAD,
|
||||
STR_8809_GO_TO_TRANSFER_UNLOAD,
|
||||
STR_880A_GO_TO_LOAD,
|
||||
STR_880B_GO_TO_TRANSFER_LOAD,
|
||||
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_880C_GO_NON_STOP_TO,
|
||||
STR_880D_GO_TO_NON_STOP_TRANSFER,
|
||||
STR_880E_GO_NON_STOP_TO_UNLOAD,
|
||||
STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD,
|
||||
STR_8810_GO_NON_STOP_TO_LOAD,
|
||||
STR_8811_GO_TO_NON_STOP_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,
|
||||
STR_NULL
|
||||
};
|
||||
|
||||
@@ -216,7 +216,7 @@ static void DrawOrdersWindow(Window *w)
|
||||
|
||||
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_ROAD: s = STR_9038_GO_TO_ROADVEH_DEPOT; break;
|
||||
case VEH_ROAD: s = STR_GO_TO_ROADVEH_DEPOT; break;
|
||||
case VEH_SHIP: s = STR_GO_TO_SHIP_DEPOT; break;
|
||||
default: break;
|
||||
}
|
||||
@@ -761,7 +761,7 @@ static const Widget _orders_train_widgets[] = {
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
|
||||
|
||||
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
|
||||
|
||||
@@ -798,7 +798,7 @@ static const Widget _orders_widgets[] = {
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
|
||||
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
|
||||
|
||||
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
|
||||
|
||||
|
Reference in New Issue
Block a user