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

(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private

Browse Source
This commit is contained in:
fonsinchen
2014-05-01 14:48:44 +00:00
parent 4ef537ba33
commit c915d9fa55
11 changed files with 83 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/order_gui.cpp
View File

@@ -266,9 +266,9 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
if (timetable) {
SetDParam(3, STR_EMPTY);
if (order->wait_time > 0) {
if (order->GetWaitTime() > 0) {
SetDParam(5, STR_TIMETABLE_STAY_FOR);
SetTimetableParams(6, 7, order->wait_time);
SetTimetableParams(6, 7, order->GetWaitTime());
}
} else {
SetDParam(3, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[order->IsRefit()][unload][load]);
@@ -334,9 +334,9 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
SetDParam(4, value);
}
if (timetable && order->wait_time > 0) {
if (timetable && order->GetWaitTime() > 0) {
SetDParam(5, STR_TIMETABLE_AND_TRAVEL_FOR);
SetTimetableParams(6, 7, order->wait_time);
SetTimetableParams(6, 7, order->GetWaitTime());
} else {
SetDParam(5, STR_EMPTY);
}