From ed250cc7b581595ed57a518ce6dfd4b00551a022 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 12 Apr 2008 13:07:25 +0000 Subject: (svn r12670) -Add: unconditional/always order 'jump/skip' variable. --- src/timetable_gui.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/timetable_gui.cpp') diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index d77691552..75ed54a65 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -179,18 +179,22 @@ static void DrawTimetableWindow(Window *w) break; - case OT_CONDITIONAL: { - extern uint ConvertSpeedToDisplaySpeed(uint speed); - OrderConditionComparator occ = order->GetConditionComparator(); - SetDParam(0, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_CONDITIONAL_TRUE_FALSE : STR_CONDITIONAL_NUM); + case OT_CONDITIONAL: SetDParam(1, order->GetConditionSkipToOrder() + 1); - SetDParam(2, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable()); - SetDParam(3, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ); - - uint value = order->GetConditionValue(); - if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value); - SetDParam(4, value); - } break; + if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) { + SetDParam(0, STR_CONDITIONAL_UNCONDITIONAL); + } else { + extern uint ConvertSpeedToDisplaySpeed(uint speed); + OrderConditionComparator occ = order->GetConditionComparator(); + SetDParam(0, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_CONDITIONAL_TRUE_FALSE : STR_CONDITIONAL_NUM); + SetDParam(2, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable()); + SetDParam(3, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ); + + uint value = order->GetConditionValue(); + if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value); + SetDParam(4, value); + } + break; default: break; } -- cgit v1.2.3-70-g09d2