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

(svn r26547) -Codechange: Collect order travel and wait times independent of timetables

Browse Source
This commit is contained in:
fonsinchen
2014-05-01 14:49:16 +00:00
parent c915d9fa55
commit 3ee31a8f89
9 changed files with 152 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/timetable_gui.cpp
View File

@@ -78,9 +78,9 @@ static bool CanDetermineTimeTaken(const Order *order, bool travelling)
/* Current order is conditional */
if (order->IsType(OT_CONDITIONAL) || order->IsType(OT_IMPLICIT)) return false;
/* No travel time and we have not already finished travelling */
if (travelling && order->GetTravelTime() == 0) return false;
if (travelling && !order->IsTravelTimetabled()) return false;
/* No wait time but we are loading at this timetabled station */
if (!travelling && order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION) &&
if (!travelling && !order->IsWaitTimetabled() && order->IsType(OT_GOTO_STATION) &&
!(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
return false;
}
@@ -121,12 +121,12 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
if (!order->IsType(OT_IMPLICIT)) {
if (travelling || i != start) {
if (!CanDetermineTimeTaken(order, true)) return;
sum += order->GetTravelTime();
sum += order->GetTimetabledTravel();
table[i].arrival = sum;
}
if (!CanDetermineTimeTaken(order, false)) return;
sum += order->GetWaitTime();
sum += order->GetTimetabledWait();
table[i].departure = sum;
}
@@ -143,7 +143,7 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
* travelling part of the first order. */
if (!travelling) {
if (!CanDetermineTimeTaken(order, true)) return;
sum += order->GetTravelTime();
sum += order->GetTimetabledTravel();
table[i].arrival = sum;
}
}
@@ -401,12 +401,12 @@ struct TimetableWindow : Window {
} else if (order->IsType(OT_IMPLICIT)) {
string = STR_TIMETABLE_NOT_TIMETABLEABLE;
colour = ((i == selected) ? TC_SILVER : TC_GREY) | TC_NO_SHADE;
} else if (order->GetTravelTime() == 0) {
} else if (!order->IsTravelTimetabled()) {
string = order->GetMaxSpeed() != UINT16_MAX ?
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED;
} else {
SetTimetableParams(0, 1, order->GetTravelTime());
SetTimetableParams(0, 1, order->GetTimetabledTravel());
string = order->GetMaxSpeed() != UINT16_MAX ?
STR_TIMETABLE_TRAVEL_FOR_SPEED : STR_TIMETABLE_TRAVEL_FOR;
}
@@ -546,7 +546,7 @@ struct TimetableWindow : Window {
StringID current = STR_EMPTY;
if (order != NULL) {
uint time = (selected % 2 == 1) ? order->GetTravelTime() : order->GetWaitTime();
uint time = (selected % 2 == 1) ? order->GetTimetabledTravel() : order->GetTimetabledWait();
if (!_settings_client.gui.timetable_in_ticks) time /= DAY_TICKS;
if (time != 0) {