Fix name prefix of TraceRestrictNewsControlField enum values

pull/266/head
Jonathan G Rennison 3 years ago
parent f2aa034a58
commit 112b235b71

@ -702,11 +702,11 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
case TRIT_NEWS_CONTROL:
switch (static_cast<TraceRestrictNewsControlField>(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;

@ -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
};
/**

@ -1429,11 +1429,11 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
case TRIT_NEWS_CONTROL:
switch (static_cast<TraceRestrictNewsControlField>(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;

Loading…
Cancel
Save