From 112b235b7154cfd9f4f604f6c63629fe83df7bf8 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 25 May 2021 18:21:24 +0100 Subject: [PATCH] Fix name prefix of TraceRestrictNewsControlField enum values --- src/tracerestrict.cpp | 4 ++-- src/tracerestrict.h | 4 ++-- src/tracerestrict_gui.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tracerestrict.cpp b/src/tracerestrict.cpp index 27693af07d..76161a7bf5 100644 --- a/src/tracerestrict.cpp +++ b/src/tracerestrict.cpp @@ -702,11 +702,11 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp case TRIT_NEWS_CONTROL: switch (static_cast(GetTraceRestrictValue(item))) { - case TRRVF_TRAIN_NOT_STUCK: + case TRNCF_TRAIN_NOT_STUCK: out.flags |= TRPRF_TRAIN_NOT_STUCK; break; - case TRRVF_CANCEL_TRAIN_NOT_STUCK: + case TRNCF_CANCEL_TRAIN_NOT_STUCK: out.flags &= ~TRPRF_TRAIN_NOT_STUCK; break; diff --git a/src/tracerestrict.h b/src/tracerestrict.h index 8d76e08a1f..da06ba0a27 100644 --- a/src/tracerestrict.h +++ b/src/tracerestrict.h @@ -276,8 +276,8 @@ enum TraceRestrictReverseValueField { * TraceRestrictItem value field, for TRIT_NEWS_CONTROL */ enum TraceRestrictNewsControlField { - TRRVF_TRAIN_NOT_STUCK = 0, ///< Train is not stuck - TRRVF_CANCEL_TRAIN_NOT_STUCK = 1, ///< Cancel train is not stuck + TRNCF_TRAIN_NOT_STUCK = 0, ///< Train is not stuck + TRNCF_CANCEL_TRAIN_NOT_STUCK = 1, ///< Cancel train is not stuck }; /** diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index 0de3c40028..32d06229f2 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -1429,11 +1429,11 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric case TRIT_NEWS_CONTROL: switch (static_cast(GetTraceRestrictValue(item))) { - case TRRVF_TRAIN_NOT_STUCK: + case TRNCF_TRAIN_NOT_STUCK: instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK; break; - case TRRVF_CANCEL_TRAIN_NOT_STUCK: + case TRNCF_CANCEL_TRAIN_NOT_STUCK: instruction_string = STR_TRACE_RESTRICT_TRAIN_NOT_STUCK_CANCEL; break;