Fix wrong prefix in trace restrict enum

TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in
TraceRestrictSpeedAdaptationControlField
This commit is contained in:
Jonathan G Rennison
2022-03-07 00:40:22 +00:00
parent 92142e5684
commit 221120090e
3 changed files with 4 additions and 4 deletions

View File

@@ -778,7 +778,7 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
out.flags &= ~TRPRF_RM_SPEED_ADAPT_EXEMPT; out.flags &= ~TRPRF_RM_SPEED_ADAPT_EXEMPT;
break; break;
case TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT: case TRSACF_REMOVE_SPEED_ADAPT_EXEMPT:
out.flags &= ~TRPRF_SPEED_ADAPT_EXEMPT; out.flags &= ~TRPRF_SPEED_ADAPT_EXEMPT;
out.flags |= TRPRF_RM_SPEED_ADAPT_EXEMPT; out.flags |= TRPRF_RM_SPEED_ADAPT_EXEMPT;
break; break;

View File

@@ -297,7 +297,7 @@ enum TraceRestrictPfPenaltyControlField {
*/ */
enum TraceRestrictSpeedAdaptationControlField { enum TraceRestrictSpeedAdaptationControlField {
TRSACF_SPEED_ADAPT_EXEMPT = 0, ///< Make train exempt from speed adaptation 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
}; };
/** /**

View File

@@ -413,7 +413,7 @@ static const StringID _speed_adaptation_control_value_str[] = {
}; };
static const uint _speed_adaptation_control_value_val[] = { static const uint _speed_adaptation_control_value_val[] = {
TRSACF_SPEED_ADAPT_EXEMPT, 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 */ /** 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; instruction_string = STR_TRACE_RESTRICT_MAKE_TRAIN_SPEED_ADAPTATION_EXEMPT;
break; break;
case TRPPCF_REMOVE_SPEED_ADAPT_EXEMPT: case TRSACF_REMOVE_SPEED_ADAPT_EXEMPT:
instruction_string = STR_TRACE_RESTRICT_REMOVE_TRAIN_SPEED_ADAPTATION_EXEMPT; instruction_string = STR_TRACE_RESTRICT_REMOVE_TRAIN_SPEED_ADAPTATION_EXEMPT;
break; break;