move if check to original position to minimize diff

YoRyan · YoRyan · commit 9abdace4b82a · 2021-05-29T00:17:25.000-07:00
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -3789,74 +3789,70 @@ public void updateSpeedInfo()
                     }
                 }
 
-                else  // Enhanced Compatibility on & SpeedLimit
+                else if (!thisObject.speed_isWarning) // Enhanced Compatibility on & SpeedLimit
                 {
-                    if (!thisObject.speed_isWarning)
+                    if (actualSpeedMpS > 998f)
                     {
+                        actualSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.SpeedLimit;
+                    }
 
-                        if (actualSpeedMpS > 998f)
-                        {
-                            actualSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.SpeedLimit;
-                        }
-
-                        if (actualSpeedMpS > 0)
+                    if (actualSpeedMpS > 0)
+                    {
+                        var tempValidSpeedSignalMpS = validSpeedSignalMpS == -1 ? 999 : validSpeedSignalMpS;
+                        if (thisObject.speed_noSpeedReductionOrIsTempSpeedReduction == 0)
                         {
-                            var tempValidSpeedSignalMpS = validSpeedSignalMpS == -1 ? 999 : validSpeedSignalMpS;
-                            if (thisObject.speed_noSpeedReductionOrIsTempSpeedReduction == 0)
+                            validSpeedLimitMpS = actualSpeedMpS;
+                            if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))
                             {
-                                validSpeedLimitMpS = actualSpeedMpS;
-                                if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))
+                                if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))
                                 {
-                                    if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))
-                                    {
-                                        actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS);
-                                    }
-                                    else
-                                    {
-                                        actualSpeedMpS = -1;
-                                    }
+                                    actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS);
                                 }
-                            }
-                            else
-                            {
-                                validTempSpeedLimitMpS = actualSpeedMpS;
-                                if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))
+                                else
                                 {
-                                    if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))
-                                    {
-                                        actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS);
-                                    }
-                                    else
-                                    {
-                                        actualSpeedMpS = -1;
-                                    }
+                                    actualSpeedMpS = -1;
                                 }
                             }
                         }
-                        else if (actualSpeedMpS < 0 && thisObject.speed_reset == 0)
+                        else
                         {
-                            float newSpeedMpS1 = Math.Min(validSpeedSignalMpS, Math.Min(validSpeedLimitMpS, validTempSpeedLimitMpS));
-
-                            if (newSpeedMpS1 != validSpeedMpS)
+                            validTempSpeedLimitMpS = actualSpeedMpS;
+                            if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))
                             {
-                                actualSpeedMpS = newSpeedMpS1;
-                            }
-                            else
-                            {
-                                actualSpeedMpS = -1;
+                                if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))
+                                {
+                                    actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS);
+                                }
+                                else
+                                {
+                                    actualSpeedMpS = -1;
+                                }
                             }
                         }
-                        else if (thisObject.speed_reset == 1)
+                    }
+                    else if (actualSpeedMpS < 0 && thisObject.speed_reset == 0)
+                    {
+                        float newSpeedMpS1 = Math.Min(validSpeedSignalMpS, Math.Min(validSpeedLimitMpS, validTempSpeedLimitMpS));
+
+                        if (newSpeedMpS1 != validSpeedMpS)
                         {
-                            actualSpeedMpS = validSpeedLimitMpS;
+                            actualSpeedMpS = newSpeedMpS1;
                         }
-
-                        thisObject.actual_speed = actualSpeedMpS;
-                        if (actualSpeedMpS > 0)
+                        else
                         {
-                            validSpeedMpS = actualSpeedMpS;
+                            actualSpeedMpS = -1;
                         }
                     }
+                    else if (thisObject.speed_reset == 1)
+                    {
+                        actualSpeedMpS = validSpeedLimitMpS;
+                    }
+
+                    thisObject.actual_speed = actualSpeedMpS;
+                    if (actualSpeedMpS > 0)
+                    {
+                        validSpeedMpS = actualSpeedMpS;
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3789,74 +3789,70 @@ public void updateSpeedInfo()`
`3789`	`3789`	`}`
`3790`	`3790`	`}`
`3791`	`3791`
`3792`		`- else // Enhanced Compatibility on & SpeedLimit`
	`3792`	`+ else if (!thisObject.speed_isWarning) // Enhanced Compatibility on & SpeedLimit`
`3793`	`3793`	`{`
`3794`		`- if (!thisObject.speed_isWarning)`
	`3794`	`+ if (actualSpeedMpS > 998f)`
`3795`	`3795`	`{`
	`3796`	`+ actualSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.SpeedLimit;`
	`3797`	`+ }`
`3796`	`3798`
`3797`		`- if (actualSpeedMpS > 998f)`
`3798`		`- {`
`3799`		`- actualSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.SpeedLimit;`
`3800`		`- }`
`3801`		`-`
`3802`		`- if (actualSpeedMpS > 0)`
	`3799`	`+ if (actualSpeedMpS > 0)`
	`3800`	`+ {`
	`3801`	`+ var tempValidSpeedSignalMpS = validSpeedSignalMpS == -1 ? 999 : validSpeedSignalMpS;`
	`3802`	`+ if (thisObject.speed_noSpeedReductionOrIsTempSpeedReduction == 0)`
`3803`	`3803`	`{`
`3804`		`- var tempValidSpeedSignalMpS = validSpeedSignalMpS == -1 ? 999 : validSpeedSignalMpS;`
`3805`		`- if (thisObject.speed_noSpeedReductionOrIsTempSpeedReduction == 0)`
	`3804`	`+ validSpeedLimitMpS = actualSpeedMpS;`
	`3805`	`+ if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))`
`3806`	`3806`	`{`
`3807`		`- validSpeedLimitMpS = actualSpeedMpS;`
`3808`		`- if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))`
	`3807`	`+ if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))`
`3809`	`3808`	`{`
`3810`		`- if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS))`
`3811`		`- {`
`3812`		`- actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS);`
`3813`		`- }`
`3814`		`- else`
`3815`		`- {`
`3816`		`- actualSpeedMpS = -1;`
`3817`		`- }`
	`3809`	`+ actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validTempSpeedLimitMpS);`
`3818`	`3810`	`}`
`3819`		`- }`
`3820`		`- else`
`3821`		`- {`
`3822`		`- validTempSpeedLimitMpS = actualSpeedMpS;`
`3823`		`- if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))`
	`3811`	`+ else`
`3824`	`3812`	`{`
`3825`		`- if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))`
`3826`		`- {`
`3827`		`- actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS);`
`3828`		`- }`
`3829`		`- else`
`3830`		`- {`
`3831`		`- actualSpeedMpS = -1;`
`3832`		`- }`
	`3813`	`+ actualSpeedMpS = -1;`
`3833`	`3814`	`}`
`3834`	`3815`	`}`
`3835`	`3816`	`}`
`3836`		`- else if (actualSpeedMpS < 0 && thisObject.speed_reset == 0)`
	`3817`	`+ else`
`3837`	`3818`	`{`
`3838`		`- float newSpeedMpS1 = Math.Min(validSpeedSignalMpS, Math.Min(validSpeedLimitMpS, validTempSpeedLimitMpS));`
`3839`		`-`
`3840`		`- if (newSpeedMpS1 != validSpeedMpS)`
	`3819`	`+ validTempSpeedLimitMpS = actualSpeedMpS;`
	`3820`	`+ if (actualSpeedMpS > Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))`
`3841`	`3821`	`{`
`3842`		`- actualSpeedMpS = newSpeedMpS1;`
`3843`		`- }`
`3844`		`- else`
`3845`		`- {`
`3846`		`- actualSpeedMpS = -1;`
	`3822`	`+ if (validSpeedMpS < Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS))`
	`3823`	`+ {`
	`3824`	`+ actualSpeedMpS = Math.Min(tempValidSpeedSignalMpS, validSpeedLimitMpS);`
	`3825`	`+ }`
	`3826`	`+ else`
	`3827`	`+ {`
	`3828`	`+ actualSpeedMpS = -1;`
	`3829`	`+ }`
`3847`	`3830`	`}`
`3848`	`3831`	`}`
`3849`		`- else if (thisObject.speed_reset == 1)`
	`3832`	`+ }`
	`3833`	`+ else if (actualSpeedMpS < 0 && thisObject.speed_reset == 0)`
	`3834`	`+ {`
	`3835`	`+ float newSpeedMpS1 = Math.Min(validSpeedSignalMpS, Math.Min(validSpeedLimitMpS, validTempSpeedLimitMpS));`
	`3836`	`+`
	`3837`	`+ if (newSpeedMpS1 != validSpeedMpS)`
`3850`	`3838`	`{`
`3851`		`- actualSpeedMpS = validSpeedLimitMpS;`
	`3839`	`+ actualSpeedMpS = newSpeedMpS1;`
`3852`	`3840`	`}`
`3853`		`-`
`3854`		`- thisObject.actual_speed = actualSpeedMpS;`
`3855`		`- if (actualSpeedMpS > 0)`
	`3841`	`+ else`
`3856`	`3842`	`{`
`3857`		`- validSpeedMpS = actualSpeedMpS;`
	`3843`	`+ actualSpeedMpS = -1;`
`3858`	`3844`	`}`
`3859`	`3845`	`}`
	`3846`	`+ else if (thisObject.speed_reset == 1)`
	`3847`	`+ {`
	`3848`	`+ actualSpeedMpS = validSpeedLimitMpS;`
	`3849`	`+ }`
	`3850`	`+`
	`3851`	`+ thisObject.actual_speed = actualSpeedMpS;`
	`3852`	`+ if (actualSpeedMpS > 0)`
	`3853`	`+ {`
	`3854`	`+ validSpeedMpS = actualSpeedMpS;`
	`3855`	`+ }`
`3860`	`3856`	`}`
`3861`	`3857`	`}`
`3862`	`3858`	`}`