File diff r12404:d58b2d050240 → r12405:ba094e765533
src/order_gui.cpp
Show inline comments
 
@@ -227,49 +227,49 @@ void DrawOrderString(const Vehicle *v, c
 
					SetDParam(1, STR_GO_TO_DEPOT);
 
					SetDParam(3, Depot::Get(order->GetDestination())->town_index);
 
				}
 

	
 
				switch (v->type) {
 
					case VEH_TRAIN: SetDParam(4, STR_ORDER_TRAIN_DEPOT); break;
 
					case VEH_ROAD:  SetDParam(4, STR_ORDER_ROAD_DEPOT); break;
 
					case VEH_SHIP:  SetDParam(4, STR_ORDER_SHIP_DEPOT); break;
 
					default: NOT_REACHED();
 
				}
 
			}
 

	
 
			if (order->GetDepotOrderType() & ODTFB_SERVICE) {
 
				SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
 
			} else {
 
				SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
 
			}
 

	
 
			if (!timetable && (order->GetDepotActionType() & ODATFB_HALT)) {
 
				SetDParam(6, STR_STOP_ORDER);
 
			}
 

	
 
			if (!timetable && order->IsRefit()) {
 
				SetDParam(6, (order->GetDepotActionType() & ODATFB_HALT) ? STR_REFIT_STOP_ORDER : STR_REFIT_ORDER);
 
				SetDParam(7, GetCargo(order->GetRefitCargo())->name);
 
				SetDParam(7, CargoSpec::Get(order->GetRefitCargo())->name);
 
			}
 
			break;
 

	
 
		case OT_GOTO_WAYPOINT:
 
			if (v->type == VEH_TRAIN) {
 
				SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
 
				SetDParam(2, order->GetDestination());
 
			} else {
 
				SetDParam(1, STR_GO_TO_STATION);
 
				SetDParam(2, STR_ORDER_GO_VIA);
 
				SetDParam(3, order->GetDestination());
 
				SetDParam(4, STR_EMPTY);
 
			}
 
			break;
 

	
 
		case OT_CONDITIONAL:
 
			SetDParam(2, order->GetConditionSkipToOrder() + 1);
 
			if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) {
 
				SetDParam(1, STR_CONDITIONAL_UNCONDITIONAL);
 
			} else {
 
				OrderConditionComparator occ = order->GetConditionComparator();
 
				SetDParam(1, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_CONDITIONAL_TRUE_FALSE : STR_CONDITIONAL_NUM);
 
				SetDParam(3, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable());
 
				SetDParam(4, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ);