src/order_gui.cpp
changeset 10118 8f5246e74ecf
parent 10117 6a796f06bff4
child 10119 9b29b2296969
equal deleted inserted replaced
10117:6a796f06bff4 10118:8f5246e74ecf
   184 	int i = w->vscroll.pos;
   184 	int i = w->vscroll.pos;
   185 	order = GetVehicleOrder(v, i);
   185 	order = GetVehicleOrder(v, i);
   186 	StringID str;
   186 	StringID str;
   187 	while (order != NULL) {
   187 	while (order != NULL) {
   188 		str = (v->cur_order_index == i) ? STR_8805 : STR_8804;
   188 		str = (v->cur_order_index == i) ? STR_8805 : STR_8804;
   189 		SetDParam(3, STR_EMPTY);
   189 		SetDParam(5, STR_EMPTY);
   190 
   190 
   191 		if (i - w->vscroll.pos < w->vscroll.cap) {
   191 		if (i - w->vscroll.pos < w->vscroll.cap) {
   192 			SetDParam(1, 6);
   192 			SetDParam(1, 6);
   193 
   193 
   194 			switch (order->GetType()) {
   194 			switch (order->GetType()) {
   226 
   226 
   227 					if (order->GetDepotOrderType() & ODTFB_SERVICE) s++; // service at
   227 					if (order->GetDepotOrderType() & ODTFB_SERVICE) s++; // service at
   228 
   228 
   229 					SetDParam(1, s);
   229 					SetDParam(1, s);
   230 					if (order->IsRefit()) {
   230 					if (order->IsRefit()) {
   231 						SetDParam(3, STR_REFIT_ORDER);
   231 						SetDParam(5, STR_REFIT_ORDER);
   232 						SetDParam(4, GetCargo(order->GetRefitCargo())->name);
   232 						SetDParam(6, GetCargo(order->GetRefitCargo())->name);
   233 					} else {
       
   234 						SetDParam(3, STR_EMPTY);
       
   235 					}
   233 					}
   236 					break;
   234 					break;
   237 				}
   235 				}
   238 
   236 
   239 				case OT_GOTO_WAYPOINT:
   237 				case OT_GOTO_WAYPOINT:
   654 
   652 
   655 				case ORDER_WIDGET_DELETE:
   653 				case ORDER_WIDGET_DELETE:
   656 					OrderClick_Delete(w, v, 0);
   654 					OrderClick_Delete(w, v, 0);
   657 					break;
   655 					break;
   658 
   656 
   659 				case ORDER_WIDGET_NON_STOP:
   657 				case ORDER_WIDGET_NON_STOP: {
   660 					ShowDropDownMenu(w, _order_non_stop_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, 0, 124);
   658 					const Order *o = GetVehicleOrder(v, OrderGetSel(w));
   661 					break;
   659 					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);
       
   660 				} break;
   662 
   661 
   663 				case ORDER_WIDGET_GOTO:
   662 				case ORDER_WIDGET_GOTO:
   664 					OrderClick_Goto(w, v, 0);
   663 					OrderClick_Goto(w, v, 0);
   665 					break;
   664 					break;
   666 
   665