dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12670) -Add: unconditional/always order 'jump/skip' variable.

Browse Source
This commit is contained in:
rubidium
2008-04-12 13:07:25 +00:00
parent fec2550803
commit 7ea682d6eb
5 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/timetable_gui.cpp
View File

@@ -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);
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;
uint value = order->GetConditionValue();
if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
SetDParam(4, value);
}
break;
default: break;
}