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

Fix departure boards not handling unconditional order jumps

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-02-10 22:36:35 +00:00
parent 8a814bbfe3
commit 764af07a33
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/departures.cpp
View File

@@ -79,6 +79,12 @@ static bool IsArrival(const Order *order, StationID station) {
!(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)); !(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION));
} }
static uint8 GetDepartureConditionalOrderMode(const Order *order)
{
if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) return 1;
return _settings_client.gui.departure_conditionals;
}
static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, uint *waiting_time, const DateTicksScaled date_only_scaled, const Vehicle *v, const Order *order, bool arrived_at_timing_point, schdispatch_cache_t &dept_schedule_last) static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, uint *waiting_time, const DateTicksScaled date_only_scaled, const Vehicle *v, const Order *order, bool arrived_at_timing_point, schdispatch_cache_t &dept_schedule_last)
{ {
if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH)) { if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH)) {
@@ -298,7 +304,7 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
/* If the order is a conditional branch, handle it. */ /* If the order is a conditional branch, handle it. */
if (order->IsType(OT_CONDITIONAL)) { if (order->IsType(OT_CONDITIONAL)) {
switch(_settings_client.gui.departure_conditionals) { switch(GetDepartureConditionalOrderMode(order)) {
case 0: { case 0: {
/* Give up */ /* Give up */
break; break;
@@ -458,7 +464,7 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
/* If the order is a conditional branch, handle it. */ /* If the order is a conditional branch, handle it. */
if (order->IsType(OT_CONDITIONAL)) { if (order->IsType(OT_CONDITIONAL)) {
switch(_settings_client.gui.departure_conditionals) { switch(GetDepartureConditionalOrderMode(order)) {
case 0: { case 0: {
/* Give up */ /* Give up */
break; break;
@@ -696,7 +702,7 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
for (int i = least_order->v->GetNumOrders(); i > 0; --i) { for (int i = least_order->v->GetNumOrders(); i > 0; --i) {
/* If the order is a conditional branch, handle it. */ /* If the order is a conditional branch, handle it. */
if (order->IsType(OT_CONDITIONAL)) { if (order->IsType(OT_CONDITIONAL)) {
switch(_settings_client.gui.departure_conditionals) { switch(GetDepartureConditionalOrderMode(order)) {
case 0: { case 0: {
/* Give up */ /* Give up */
break; break;