Merge pull request #583 from Csantucci/ORTS_SIGNED_TRACTION_BRAKING-glitch-fix

Csantucci · web-flow · commit e549403b8c04 · 2022-02-07T13:58:36.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1959660 Glitch in ORTS_SIGNED_TRACTION_BRAKING
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -4553,11 +4553,11 @@ public virtual float GetDataOf(CabViewControl cvc)
                                     MaxCurrentA = (float)cvc.MaxValue;
                                 if (DynamicBrakeMaxCurrentA == 0)
                                     DynamicBrakeMaxCurrentA = (float)cvc.MinValue;
-                                if (ThrottlePercent > 0)
+                                if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)
                                 {
                                     data = (data / MaxForceN) * MaxCurrentA;
                                 }
-                                if (DynamicBrakePercent > 0)
+                                if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)
                                 {
                                     data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
                                 }

Original file line number	Diff line number	Diff line change
`@@ -4553,11 +4553,11 @@ public virtual float GetDataOf(CabViewControl cvc)`
`4553`	`4553`	`MaxCurrentA = (float)cvc.MaxValue;`
`4554`	`4554`	`if (DynamicBrakeMaxCurrentA == 0)`
`4555`	`4555`	`DynamicBrakeMaxCurrentA = (float)cvc.MinValue;`
`4556`		`- if (ThrottlePercent > 0)`
	`4556`	`+ if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)`
`4557`	`4557`	`{`
`4558`	`4558`	`data = (data / MaxForceN) * MaxCurrentA;`
`4559`	`4559`	`}`
`4560`		`- if (DynamicBrakePercent > 0)`
	`4560`	`+ if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)`
`4561`	`4561`	`{`
`4562`	`4562`	`data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;`
`4563`	`4563`	`}`