From 84b41b78a724111cc9bb7c41783298b527fc0763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= <bunny@awril.pl>
Date: Sun, 27 Oct 2019 13:40:19 +0100
Subject: [PATCH] Fix of speed control: for EN57A EMUs

---
 DynObj.cpp         |  1 +
 McZapkie/Mover.cpp | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/DynObj.cpp b/DynObj.cpp
index 960d2a47..74e00f91 100644
--- a/DynObj.cpp
+++ b/DynObj.cpp
@@ -2855,6 +2855,7 @@ bool TDynamicObject::Update(double dt, double dt1)
              && ( ctOwner != nullptr ) ) {
 				MoverParameters->MainCtrlPos = ctOwner->Controlling()->MainCtrlPos*MoverParameters->MainCtrlPosNo / std::max(1, ctOwner->Controlling()->MainCtrlPosNo);
 				MoverParameters->SpeedCtrlValue = ctOwner->Controlling()->SpeedCtrlValue;
+				MoverParameters->SpeedCtrlUnit.IsActive = ctOwner->Controlling()->SpeedCtrlUnit.IsActive;
 			}
 			MoverParameters->CheckEIMIC(dt1);
 			MoverParameters->CheckSpeedCtrl(dt1);
diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index df6b033a..aa4fa25d 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -2216,16 +2216,12 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed)
 	if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1) && (MainCtrlPos>0))
 	{
 		// NOTE: round() already adds 0.5, are the ones added here as well correct?
-		if ((Vmax < 250))
-			SpeedCtrlValue = Round(Vel);
-		else
-			SpeedCtrlValue = Round(Vel * 0.5);
+		SpeedCtrlValue = Vel;
 		if ((EIMCtrlType == 0)&&(SpeedCtrlAutoTurnOffFlag == 1))
 		{
 			MainCtrlActualPos = MainCtrlPos;
 		}
 		SpeedCtrlUnit.IsActive = true;
-		SendCtrlToNext("SpeedCntrl", SpeedCtrlValue, CabNo);
 	}
 
  	if ((OK) && (SpeedCtrl) && (ScndCtrlPos == 1) && (EngineType == TEngineType::DieselEngine))
@@ -2286,7 +2282,6 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed)
 	if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1))
 	{
 		SpeedCtrlValue = 0;
-		SendCtrlToNext("SpeedCntrl", SpeedCtrlValue, CabNo);
 		SpeedCtrlUnit.IsActive = false;
 		if (SpeedCtrlUnit.ManualStateOverride) {
 			eimic = 0.0;
@@ -5603,11 +5598,10 @@ double TMoverParameters::TractionForce( double dt ) {
 						SpeedCtrlTimer += dt;
 						if (SpeedCtrlTimer > SpeedCtrlDelay)
 						{
-							int NewSCAP = (Vmax < 250 ? 1 : 0.5) * (float)ScndCtrlPos / (float)ScndCtrlPosNo * Vmax;
+							int NewSCAP = (float)ScndCtrlPos / (float)ScndCtrlPosNo * Vmax;
 							if (NewSCAP != SpeedCtrlValue)
 							{
 								SpeedCtrlValue = NewSCAP;
-//								SendCtrlToNext("SpeedCntrl", SpeedCtrlValue, CabNo);
 							}
 						}
 					}