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

Add routing restrictions action to control news reports about stuck trains

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-08-29 13:32:53 +01:00
parent cc6be16422
commit d2594ece79
7 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tracerestrict.cpp
View File

@@ -641,6 +641,22 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
break;
}
case TRIT_NEWS_CONTROL:
switch (static_cast<TraceRestrictNewsControlField>(GetTraceRestrictValue(item))) {
case TRRVF_TRAIN_NOT_STUCK:
out.flags |= TRPRF_TRAIN_NOT_STUCK;
break;
case TRRVF_CANCEL_TRAIN_NOT_STUCK:
out.flags &= ~TRPRF_TRAIN_NOT_STUCK;
break;
default:
NOT_REACHED();
break;
}
break;
default:
NOT_REACHED();
}
@@ -814,6 +830,10 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
actions_used_flags |= TRPAUF_SPEED_RESTRICTION;
break;
case TRIT_NEWS_CONTROL:
actions_used_flags |= TRPAUF_TRAIN_NOT_STUCK;
break;
default:
return_cmd_error(STR_TRACE_RESTRICT_ERROR_VALIDATE_UNKNOWN_INSTRUCTION);
}
@@ -876,6 +896,7 @@ void SetTraceRestrictValueDefault(TraceRestrictItem &item, TraceRestrictValueTyp
case TRVT_TRAIN_STATUS:
case TRVT_REVERSE:
case TRVT_PERCENT:
case TRVT_NEWS_CONTROL:
SetTraceRestrictValue(item, 0);
if (!IsTraceRestrictTypeAuxSubtype(GetTraceRestrictType(item))) {
SetTraceRestrictAuxField(item, 0);