From dad007e16a84c2711ed4151dbc3e150e9609d938 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 13 Nov 2021 02:00:37 +0000 Subject: [PATCH] Fix spelling of TRPRF_SPEED_RESTRICTION_SET --- src/pbs.cpp | 2 +- src/tracerestrict.cpp | 2 +- src/tracerestrict.h | 4 ++-- src/train_cmd.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pbs.cpp b/src/pbs.cpp index 837624c63a..14e681b8fb 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -579,7 +579,7 @@ static PBSTileInfo FollowReservation(Owner o, RailTypes rts, TileIndex tile, Tra if (out.flags & TRPRF_REVERSE && au_flags & TRPAUF_REVERSE) { lookahead->AddReverse(z); } - if (out.flags & TRPRF_SPEED_RETRICTION_SET) { + if (out.flags & TRPRF_SPEED_RESTRICTION_SET) { lookahead->AddSpeedRestriction(out.speed_restriction, z); if (out.speed_restriction != 0 && (speed_restriction == 0 || out.speed_restriction < speed_restriction)) { /* lower of the speed restrictions before or after the signal */ diff --git a/src/tracerestrict.cpp b/src/tracerestrict.cpp index 37b2420602..1f113dbaa7 100644 --- a/src/tracerestrict.cpp +++ b/src/tracerestrict.cpp @@ -700,7 +700,7 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp case TRIT_SPEED_RESTRICTION: { out.speed_restriction = GetTraceRestrictValue(item); - out.flags |= TRPRF_SPEED_RETRICTION_SET; + out.flags |= TRPRF_SPEED_RESTRICTION_SET; break; } diff --git a/src/tracerestrict.h b/src/tracerestrict.h index a11b57a09a..5df1c2abda 100644 --- a/src/tracerestrict.h +++ b/src/tracerestrict.h @@ -382,7 +382,7 @@ enum TraceRestrictProgramResultFlags { TRPRF_WAIT_AT_PBS = 1 << 3, ///< Wait at PBS signal is set TRPRF_PBS_RES_END_WAIT = 1 << 4, ///< PBS reservations ending at this signal wait is set TRPRF_REVERSE = 1 << 5, ///< Reverse behind signal - TRPRF_SPEED_RETRICTION_SET = 1 << 6, ///< Speed restriction field set + TRPRF_SPEED_RESTRICTION_SET = 1 << 6, ///< Speed restriction field set TRPRF_TRAIN_NOT_STUCK = 1 << 7, ///< Train is not stuck TRPRF_NO_PBS_BACK_PENALTY = 1 << 8, ///< Do not apply PBS back penalty }; @@ -448,7 +448,7 @@ struct TraceRestrictProgramInput { struct TraceRestrictProgramResult { uint32 penalty; ///< Total additional pathfinder penalty TraceRestrictProgramResultFlags flags; ///< Flags of other actions to take - uint16 speed_restriction; ///> Speed restriction to apply (if TRPRF_SPEED_RETRICTION_SET flag present) + uint16 speed_restriction; ///> Speed restriction to apply (if TRPRF_SPEED_RESTRICTION_SET flag present) TraceRestrictProgramResult() : penalty(0), flags(static_cast(0)) { } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e2b92fc582..06ba7adf00 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -5349,7 +5349,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) v->reverse_distance = v->gcache.cached_total_length + (IsDiagonalTrack(TrackdirToTrack(dir)) ? 16 : 8); SetWindowDirty(WC_VEHICLE_VIEW, v->index); } - if (out.flags & TRPRF_SPEED_RETRICTION_SET) { + if (out.flags & TRPRF_SPEED_RESTRICTION_SET) { SetBit(v->flags, VRF_PENDING_SPEED_RESTRICTION); auto range = pending_speed_restriction_change_map.equal_range(v->index); for (auto it = range.first; it != range.second; ++it) {