eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-12 15:11:01 +01:00
Code Issues 139 Wiki Activity

Drop redundant comparisons with true/false

Browse Source 
In the conditions this PR adds; no change in behaviour.
This commit is contained in:
pwarszawski
2026-09-29 09:47:51 +02:00
parent ce87aa0e09
commit 4f2dfd9318
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Oerlikon_ESt.cpp
View File

@@ -327,7 +327,7 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c
double TNESt3::GetRapidRatio(double const Vel) const double TNESt3::GetRapidRatio(double const Vel) const
{ {
// ESt3 has no rapid relay, and with disc brakes the rapid step stays engaged at all speeds // ESt3 has no rapid relay, and with disc brakes the rapid step stays engaged at all speeds
if( ( PrzekRapid == nullptr ) || ( true == RapidStaly ) ) { if( ( PrzekRapid == nullptr ) || RapidStaly ) {
return 1.0; return 1.0;
} }
// a braking vehicle comes from above, so the step is still engaged down to the speed // a braking vehicle comes from above, so the step is still engaged down to the speed

6
vehicle/Driver.cpp
View File

@@ -6672,7 +6672,7 @@ TController::determine_proximity_ranges() {
// na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody
// jeśli pociąg // jeśli pociąg
if( is_train() ) { if( is_train() ) {
if( true == IsAtPassengerStop ) { if( IsAtPassengerStop ) {
// a stop point keeps the margins its W4 parameters (head or middle of the consist, // a stop point keeps the margins its W4 parameters (head or middle of the consist,
// platform length) were set up against // platform length) were set up against
fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 ); fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 );
@@ -7342,7 +7342,7 @@ TController::pick_optimal_speed( double const Range ) {
is_car() ? -2.0 : -0.9, is_car() ? -2.0 : -0.9,
is_car() ? 2.0 : 0.9 ); is_car() ? 2.0 : 0.9 );
if( ( true == is_train() ) if( is_train()
&& ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( ( OrderCurrentGet() & Obey_train ) != 0 )
&& ( VelNext == 0.0 ) && ( VelNext == 0.0 )
&& ( ActualProximityDist <= fMaxProximityDist ) && ( ActualProximityDist <= fMaxProximityDist )
@@ -7872,7 +7872,7 @@ TController::adjust_desired_speed_for_current_speed() {
-0.05 + fAccThreshold, -0.05 + fAccThreshold,
std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) ); std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) );
// HACK: for cargo trains with high braking threshold ensure we cross that threshold // HACK: for cargo trains with high braking threshold ensure we cross that threshold
if( true == IsCargoTrain if( IsCargoTrain
&& fBrake_a0[0] > 0.2 && fBrake_a0[0] > 0.2
&& speedestimate > holdlimit ) { && speedestimate > holdlimit ) {
AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 );

2
vehicle/Driver.h
View File

@@ -356,7 +356,7 @@ private:
// how far short of a stop the AI aims: in train running the middle of the 8-15 m window before a signal, // how far short of a stop the AI aims: in train running the middle of the 8-15 m window before a signal,
// otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before // otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before
double stopping_margin() const { double stopping_margin() const {
return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( false == IsAtPassengerStop ) ? return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && !IsAtPassengerStop ?
fMinProximityDist + 3.5 : fMinProximityDist + 3.5 :
0.5 * fMinProximityDist; } 0.5 * fMinProximityDist; }
void apply_independent_brake_only(); void apply_independent_brake_only();