From 221120090ef44f7cfd2f12f96a78240c294e7fe0 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 7 Mar 2022 00:40:22 +0000 Subject: [PATCH] Fix wrong prefix in trace restrict enum TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in TraceRestrictSpeedAdaptationControlField --- src/tracerestrict.cpp | 2 +- src/tracerestrict.h | 2 +- src/tracerestrict_gui.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tracerestrict.cpp b/src/tracerestrict.cpp index 7b1fcfd6af..e86099d637 100644 --- a/src/tracerestrict.cpp +++ b/src/tracerestrict.cpp @@ -778,7 +778,7 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp out.flags &= ~TRPRF_RM_SPEED_ADAPT_EXEMPT; break; - case TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT: + case TRSACF_REMOVE_SPEED_ADAPT_EXEMPT: out.flags &= ~TRPRF_SPEED_ADAPT_EXEMPT; out.flags |= TRPRF_RM_SPEED_ADAPT_EXEMPT; break; diff --git a/src/tracerestrict.h b/src/tracerestrict.h index 94d9fb2c31..dbdfe96a09 100644 --- a/src/tracerestrict.h +++ b/src/tracerestrict.h @@ -297,7 +297,7 @@ enum TraceRestrictPfPenaltyControlField { */ enum TraceRestrictSpeedAdaptationControlField { TRSACF_SPEED_ADAPT_EXEMPT = 0, ///< Make train exempt from speed adaptation - TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT = 1, ///< Remove train exempt from speed adaptation + TRSACF_REMOVE_SPEED_ADAPT_EXEMPT = 1, ///< Remove train exempt from speed adaptation }; /** diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index 685c33474a..b3d4684465 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -413,7 +413,7 @@ static const StringID _speed_adaptation_control_value_str[] = { }; static const uint _speed_adaptation_control_value_val[] = { TRSACF_SPEED_ADAPT_EXEMPT, - TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT, + TRSACF_REMOVE_SPEED_ADAPT_EXEMPT, }; /** value drop down list for speed adaptation control types strings and values */ @@ -1582,7 +1582,7 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric instruction_string = STR_TRACE_RESTRICT_MAKE_TRAIN_SPEED_ADAPTATION_EXEMPT; break; - case TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT: + case TRSACF_REMOVE_SPEED_ADAPT_EXEMPT: instruction_string = STR_TRACE_RESTRICT_REMOVE_TRAIN_SPEED_ADAPTATION_EXEMPT; break;