mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r12649) -Fix: refit orders not being shown. 

-Fix: unusable non-stop orders shown for waypoints and depots.
This commit is contained in:
rubidium 2008-04-10 10:02:15 +00:00
parent 5992dad01f
commit 3974bf2199
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/english.txt
View File

@ -2652,8 +2652,8 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
STR_8802_DETAILS :{WHITE}{VEHICLE} (Details)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way
STR_8804 :{SETX 10}{COMMA}: {STRING3}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3}
STR_8804 :{SETX 10}{COMMA}: {STRING3} {STRING2}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3} {STRING2}
STR_ORDER_GO_TO :Go to
STR_ORDER_GO_NON_STOP_TO :Go non-stop to
STR_ORDER_GO_VIA :Go via

15
src/order_gui.cpp
View File

@ -186,7 +186,7 @@ static void DrawOrdersWindow(Window *w)
StringID str;
while (order != NULL) {
str = (v->cur_order_index == i) ? STR_8805 : STR_8804;
SetDParam(3, STR_EMPTY);
SetDParam(5, STR_EMPTY);
if (i - w->vscroll.pos < w->vscroll.cap) {
SetDParam(1, 6);
@ -228,10 +228,8 @@ static void DrawOrdersWindow(Window *w)
SetDParam(1, s);
if (order->IsRefit()) {
SetDParam(3, STR_REFIT_ORDER);
SetDParam(4, GetCargo(order->GetRefitCargo())->name);
} else {
SetDParam(3, STR_EMPTY);
SetDParam(5, STR_REFIT_ORDER);
SetDParam(6, GetCargo(order->GetRefitCargo())->name);
}
break;
}
@ -656,9 +654,10 @@ static void OrdersWndProc(Window *w, WindowEvent *e)
OrderClick_Delete(w, v, 0);
break;
case ORDER_WIDGET_NON_STOP:
ShowDropDownMenu(w, _order_non_stop_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, 0, 124);
break;
case ORDER_WIDGET_NON_STOP: {
const Order *o = GetVehicleOrder(v, OrderGetSel(w));
ShowDropDownMenu(w, _order_non_stop_drowdown, o->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, o->IsType(OT_GOTO_STATION) ? 0 : (o->IsType(OT_GOTO_WAYPOINT) ? 3 : 12), 124);
} break;
case ORDER_WIDGET_GOTO:
OrderClick_Goto(w, v, 0);