From fd1df9ad5168413a162a2f7ff8f909e26879d942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= <bunny@awril.pl>
Date: Sat, 12 Oct 2019 22:13:00 +0200
Subject: [PATCH] Changed speed control work on "no force" position

---
 McZapkie/Mover.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index f19bb393..fb47561b 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -6649,15 +6649,15 @@ void TMoverParameters::CheckSpeedCtrl(double dt)
 		if (EngineType == TEngineType::DieselEngine) {
 			if ((!SpeedCtrlUnit.Standby)) {
 				if (SpeedCtrlUnit.ManualStateOverride) {
-					if (MainCtrlPos < MainCtrlPosNo - 1) {
+/*					if (MainCtrlPos < MainCtrlPosNo - 1) {
 						eimic = std::min(eimic, 0.0);
 						eimicSpeedCtrlIntegral = 0.0;
-					}
-					else if (eimic > 0.009) eimic = 1.0;
+					} 
+					else*/ if (eimic > 0.009) eimic = 1.0;
 				}
 				double error = (std::max(SpeedCtrlValue + SpeedCtrlUnit.Offset, 0.0) - Vel);
 				double factorP = error > 0 ? SpeedCtrlUnit.FactorPpos : SpeedCtrlUnit.FactorPneg;
-				double eSCP = clamp(factorP * error, -1.2, 1.0);  //P module
+				double eSCP = clamp(factorP * error, -1.2, UniCtrlList[MainCtrlPos].MaxCtrlVal);  //P module
 				if (eSCP < -1.0)
 				{
 					SpeedCtrlUnit.BrakeInterventionBraking = (eSCP < -1.1) && (Vel < hydro_TC_UnlockSpeed);