From fa9136e3333bb6fd7a2560fb55959c3d7d3d502e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 2 May 2021 23:19:47 +0200 Subject: [PATCH] Repair of St133 drivers' valve for both player and AI --- Driver.cpp | 16 ++++++++-------- McZapkie/hamulce.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index dab7085f..13b19068 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3197,15 +3197,15 @@ bool TController::DecBrake() { clamp( -AccDesired / AccMax * mvOccupied->AIHintLocalBrakeAccFactor, 0.0, 1.0 ) ) ); OK = ( mvOccupied->fBrakeCtrlPos != initialbrakeposition ); } - else if( mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos( bh_EPR ) ) { - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EPR)); - if( mvOccupied->Handle->GetPos( bh_EPR ) - mvOccupied->Handle->GetPos( bh_EPN ) < 0.1 ) { - mvOccupied->SwitchEPBrake( 1 ); - } - OK = true; - } else { - OK = false; + OK = false; + if (mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos(bh_EPR)) { + mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EPR)); + OK = true; + } + if (mvOccupied->Handle->GetPos(bh_EPR) - mvOccupied->Handle->GetPos(bh_EPN) < 0.1) { + OK = OK || mvOccupied->SwitchEPBrake(1); + } } if( !OK ) { OK = mvOccupied->DecLocalBrakeLevel( 2 ); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index dc7fcfb8..75b498b3 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -3135,7 +3135,7 @@ double TSt113::GetPF(double i_bcp, double PP, double HP, double dt, double ep) BCP = lround(i_bcp); - EPS = BEP_K[BCP]; + EPS = BEP_K[BCP+1]; if (BCP > 0) BCP = BCP - 1;