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

Fix name prefix of TraceRestrictNewsControlField enum values

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-05-25 18:21:24 +01:00
parent f2aa034a58
commit 112b235b71
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracerestrict.cpp
View File

@@ -702,11 +702,11 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
case TRIT_NEWS_CONTROL: case TRIT_NEWS_CONTROL:
switch (static_cast<TraceRestrictNewsControlField>(GetTraceRestrictValue(item))) { switch (static_cast<TraceRestrictNewsControlField>(GetTraceRestrictValue(item))) {
case TRRVF_TRAIN_NOT_STUCK: case TRNCF_TRAIN_NOT_STUCK:
out.flags |= TRPRF_TRAIN_NOT_STUCK; out.flags |= TRPRF_TRAIN_NOT_STUCK;
break; break;
case TRRVF_CANCEL_TRAIN_NOT_STUCK: case TRNCF_CANCEL_TRAIN_NOT_STUCK:
out.flags &= ~TRPRF_TRAIN_NOT_STUCK; out.flags &= ~TRPRF_TRAIN_NOT_STUCK;
break; break;

4
src/tracerestrict.h
View File

@@ -276,8 +276,8 @@ enum TraceRestrictReverseValueField {
* TraceRestrictItem value field, for TRIT_NEWS_CONTROL * TraceRestrictItem value field, for TRIT_NEWS_CONTROL
*/ */
enum TraceRestrictNewsControlField { enum TraceRestrictNewsControlField {
TRRVF_TRAIN_NOT_STUCK = 0, ///< Train is not stuck TRNCF_TRAIN_NOT_STUCK = 0, ///< Train is not stuck
TRRVF_CANCEL_TRAIN_NOT_STUCK = 1, ///< Cancel train is not stuck TRNCF_CANCEL_TRAIN_NOT_STUCK = 1, ///< Cancel train is not stuck
}; };
/** /**

4
src/tracerestrict_gui.cpp
View File

@@ -1429,11 +1429,11 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
case TRIT_NEWS_CONTROL: case TRIT_NEWS_CONTROL:
switch (static_cast<TraceRestrictNewsControlField>(GetTraceRestrictValue(item))) { switch (static_cast<TraceRestrictNewsControlField>(GetTraceRestrictValue(item))) {
case TRRVF_TRAIN_NOT_STUCK: case TRNCF_TRAIN_NOT_STUCK:
instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK; instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK;
break; break;
case TRRVF_CANCEL_TRAIN_NOT_STUCK: case TRNCF_CANCEL_TRAIN_NOT_STUCK:
instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK_CANCEL; instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK_CANCEL;
break; break;