From bea66c4bebd6bb34fa587d5ebfe6788953bd79da Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 30 Jun 2024 19:12:08 +0100 Subject: [PATCH] Fix minor code style issue --- src/pathfinder/yapf/yapf_costrail.hpp | 6 +++--- src/pbs.cpp | 6 +++--- src/signal.cpp | 4 ++-- src/train_cmd.cpp | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp index f8a9f0fd97..d9ed73c2d5 100644 --- a/src/pathfinder/yapf/yapf_costrail.hpp +++ b/src/pathfinder/yapf/yapf_costrail.hpp @@ -300,7 +300,7 @@ private: if (GetSignalType(tile, TrackdirToTrack(trackdir)) == SIGTYPE_PBS && !HasSignalOnTrackdir(tile, trackdir)) { flags_to_check |= TRPAUF_REVERSE; } - if (prog && prog->actions_used_flags & flags_to_check) { + if (prog != nullptr && prog->actions_used_flags & flags_to_check) { prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out); if (out.flags & TRPRF_RESERVE_THROUGH && is_res_through != nullptr) { *is_res_through = true; @@ -326,7 +326,7 @@ private: { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); TraceRestrictProgramActionsUsedFlags flags_to_check = TRPAUF_PF; - if (prog && prog->actions_used_flags & flags_to_check) { + if (prog != nullptr && prog->actions_used_flags & flags_to_check) { prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out); if (out.flags & TRPRF_DENY) { n.m_segment->m_end_segment_reason |= ESRB_DEAD_END; @@ -428,7 +428,7 @@ public: if (IsNoEntrySignal(sig_type)) { if (ShouldCheckTraceRestrict(n, tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); - if (prog && prog->actions_used_flags & TRPAUF_PF) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_PF) { TraceRestrictProgramResult out; prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out); if (out.flags & TRPRF_DENY) { diff --git a/src/pbs.cpp b/src/pbs.cpp index 5608c059fc..80d0fdc44d 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -366,7 +366,7 @@ static uint16_t ApplyTunnelBridgeLookaheadSignalSpeedRestriction(TileIndex tile, trackdir = GetTunnelBridgeExitTrackdir(tile); } const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); - if (prog && prog->actions_used_flags & TRPAUF_SPEED_RESTRICTION) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_SPEED_RESTRICTION) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(tile, trackdir, nullptr, nullptr); prog->Execute(v, input, out); @@ -650,7 +650,7 @@ static PBSTileInfo FollowReservation(Owner o, RailTypes rts, TileIndex tile, Tra uint16_t speed_restriction = lookahead->speed_restriction; if (v != nullptr) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); - if (prog && prog->actions_used_flags & au_flags) { + if (prog != nullptr && prog->actions_used_flags & au_flags) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(tile, trackdir, nullptr, nullptr); prog->Execute(v, input, out); @@ -1507,7 +1507,7 @@ bool IsSafeWaitingPosition(const Train *v, TileIndex tile, Trackdir trackdir, bo if (GetSignalAlwaysReserveThrough(ft.m_new_tile, TrackdirToTrack(td))) return false; if (IsRestrictedSignal(ft.m_new_tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(ft.m_new_tile, TrackdirToTrack(td)); - if (prog && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH) { TraceRestrictProgramResult out; prog->Execute(v, TraceRestrictProgramInput(ft.m_new_tile, td, &VehiclePosTraceRestrictPreviousSignalCallback, nullptr), out); if (out.flags & TRPRF_RESERVE_THROUGH) { diff --git a/src/signal.cpp b/src/signal.cpp index 8d117489f2..4a70410028 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -1576,7 +1576,7 @@ void DetermineCombineNormalShuntModeWithLookahead(Train *v, TileIndex tile, Trac if (IsRestrictedSignal(tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); - if (prog && prog->actions_used_flags & TRPAUF_CMB_SIGNAL_MODE_CTRL) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_CMB_SIGNAL_MODE_CTRL) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(tile, trackdir, [](const Train *v, const void *, TraceRestrictPBSEntrySignalAuxField mode) { if (mode == TRPESAF_RES_END_TILE) { @@ -1973,7 +1973,7 @@ void UpdateSignalReserveThroughBit(TileIndex tile, Track track, bool update_sign } else { if (IsRestrictedSignal(tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, track); - if (prog && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH_ALWAYS) reserve_through = true; + if (prog != nullptr && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH_ALWAYS) reserve_through = true; } } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index d6f01a8f09..af16cc7e8e 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -4258,7 +4258,7 @@ static bool HasLongReservePbsSignalOnTrackdir(Train* v, TileIndex tile, Trackdir if (IsNoEntrySignal(tile, TrackdirToTrack(trackdir))) return false; if (IsRestrictedSignal(tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); - if (prog && prog->actions_used_flags & TRPAUF_LONG_RESERVE) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_LONG_RESERVE) { TraceRestrictProgramResult out; if (default_value) out.flags |= TRPRF_LONG_RESERVE; TraceRestrictProgramInput input(tile, trackdir, &VehiclePosTraceRestrictPreviousSignalCallback, nullptr); @@ -4441,7 +4441,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, if (track != INVALID_TRACK && HasPbsSignalOnTrackdir(tile, TrackEnterdirToTrackdir(track, enterdir)) && !IsNoEntrySignal(tile, track)) { if (IsRestrictedSignal(tile) && v->force_proceed != TFP_SIGNAL) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, track); - if (prog && prog->actions_used_flags & (TRPAUF_WAIT_AT_PBS | TRPAUF_SLOT_ACQUIRE | TRPAUF_TRAIN_NOT_STUCK)) { + if (prog != nullptr && prog->actions_used_flags & (TRPAUF_WAIT_AT_PBS | TRPAUF_SLOT_ACQUIRE | TRPAUF_TRAIN_NOT_STUCK)) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(tile, TrackEnterdirToTrackdir(track, enterdir), nullptr, nullptr); input.permitted_slot_operations = TRPISP_ACQUIRE; @@ -5326,7 +5326,7 @@ static bool CheckTrainStayInWormHolePathReserve(Train *t, TileIndex tile) auto try_exit_reservation = [&]() -> bool { if (IsTunnelBridgeRestrictedSignal(tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(td)); - if (prog && prog->actions_used_flags & (TRPAUF_WAIT_AT_PBS | TRPAUF_SLOT_ACQUIRE)) { + if (prog != nullptr && prog->actions_used_flags & (TRPAUF_WAIT_AT_PBS | TRPAUF_SLOT_ACQUIRE)) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(tile, td, nullptr, nullptr); input.permitted_slot_operations = TRPISP_ACQUIRE; @@ -5932,7 +5932,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) if (IsTunnelBridgeRestrictedSignal(old_tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(old_tile, track); - if (prog && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(old_tile, trackdir, nullptr, nullptr); input.permitted_slot_operations = TRPISP_RELEASE_BACK; @@ -6173,7 +6173,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) if (HasSignalOnTrack(gp.old_tile, track)) { if (IsRestrictedSignal(gp.old_tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(gp.old_tile, track); - if (prog && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(gp.old_tile, ReverseTrackdir(rev_trackdir), nullptr, nullptr); input.permitted_slot_operations = TRPISP_RELEASE_BACK; @@ -6191,7 +6191,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) if (TrackdirEntersTunnelBridge(gp.old_tile, rev_trackdir)) { if (IsTunnelBridgeRestrictedSignal(gp.old_tile)) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(gp.old_tile, track); - if (prog && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { + if (prog != nullptr && prog->actions_used_flags & TRPAUF_SLOT_RELEASE_BACK) { TraceRestrictProgramResult out; TraceRestrictProgramInput input(gp.old_tile, ReverseTrackdir(rev_trackdir), nullptr, nullptr); input.permitted_slot_operations = TRPISP_RELEASE_BACK;