mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-10 20:43:02 +01:00
Drop redundant comparisons with true/false
In the conditions this PR adds; no change in behaviour.
This commit is contained in:
@@ -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
|
||||
{
|
||||
// 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;
|
||||
}
|
||||
// a braking vehicle comes from above, so the step is still engaged down to the speed
|
||||
|
||||
@@ -6672,7 +6672,7 @@ TController::determine_proximity_ranges() {
|
||||
// na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody
|
||||
// jeśli pociąg
|
||||
if( is_train() ) {
|
||||
if( true == IsAtPassengerStop ) {
|
||||
if( IsAtPassengerStop ) {
|
||||
// a stop point keeps the margins its W4 parameters (head or middle of the consist,
|
||||
// platform length) were set up against
|
||||
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 );
|
||||
|
||||
if( ( true == is_train() )
|
||||
if( is_train()
|
||||
&& ( ( OrderCurrentGet() & Obey_train ) != 0 )
|
||||
&& ( VelNext == 0.0 )
|
||||
&& ( ActualProximityDist <= fMaxProximityDist )
|
||||
@@ -7872,7 +7872,7 @@ TController::adjust_desired_speed_for_current_speed() {
|
||||
-0.05 + fAccThreshold,
|
||||
std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) );
|
||||
// HACK: for cargo trains with high braking threshold ensure we cross that threshold
|
||||
if( true == IsCargoTrain
|
||||
if( IsCargoTrain
|
||||
&& fBrake_a0[0] > 0.2
|
||||
&& speedestimate > holdlimit ) {
|
||||
AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 );
|
||||
|
||||
@@ -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,
|
||||
// otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before
|
||||
double stopping_margin() const {
|
||||
return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( false == IsAtPassengerStop ) ?
|
||||
return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && !IsAtPassengerStop ?
|
||||
fMinProximityDist + 3.5 :
|
||||
0.5 * fMinProximityDist; }
|
||||
void apply_independent_brake_only();
|
||||
|
||||
Reference in New Issue
Block a user