Merge pull request #781 from Roeterdink/PendingSpeedUpdate

cjakeman · web-flow · commit a8616f6c3fac · 2023-02-27T20:03:48.000Z
Correct update of pending speed limits for timetable mode
diff --git a/Source/Orts.Simulation/Simulation/AIs/AITrain.cs b/Source/Orts.Simulation/Simulation/AIs/AITrain.cs
@@ -5345,7 +5345,7 @@ public void SetAIPendingSpeedLimit(ActivateSpeedLimit speedInfo)
                 else
                     AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxTempSpeedLimitMpS));
             }
-            if (speedInfo.MaxTempSpeedMpSLimit > 0 && !Simulator.TimetableMode)
+            if (speedInfo.MaxTempSpeedMpSLimit > 0)
             {
                 allowedMaxTempSpeedLimitMpS = allowedAbsoluteMaxTempSpeedLimitMpS;
                 AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxTempSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxSpeedLimitMpS));
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -11042,7 +11042,7 @@ public void SetPendingSpeedLimit(ActivateSpeedLimit speedInfo)
                 else
                     AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxTempSpeedLimitMpS));
             }
-            if (speedInfo.MaxTempSpeedMpSLimit > 0 && !Simulator.TimetableMode)
+            if (speedInfo.MaxTempSpeedMpSLimit > 0)
             {
                 allowedMaxTempSpeedLimitMpS = allowedAbsoluteMaxTempSpeedLimitMpS;
                 AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxTempSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxSpeedLimitMpS));

Original file line number	Diff line number	Diff line change
`@@ -5345,7 +5345,7 @@ public void SetAIPendingSpeedLimit(ActivateSpeedLimit speedInfo)`
`5345`	`5345`	`else`
`5346`	`5346`	`AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxTempSpeedLimitMpS));`
`5347`	`5347`	`}`
`5348`		`- if (speedInfo.MaxTempSpeedMpSLimit > 0 && !Simulator.TimetableMode)`
	`5348`	`+ if (speedInfo.MaxTempSpeedMpSLimit > 0)`
`5349`	`5349`	`{`
`5350`	`5350`	`allowedMaxTempSpeedLimitMpS = allowedAbsoluteMaxTempSpeedLimitMpS;`
`5351`	`5351`	`AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxTempSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxSpeedLimitMpS));`
Original file line number	Diff line number	Diff line change
`@@ -11042,7 +11042,7 @@ public void SetPendingSpeedLimit(ActivateSpeedLimit speedInfo)`
`11042`	`11042`	`else`
`11043`	`11043`	`AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxTempSpeedLimitMpS));`
`11044`	`11044`	`}`
`11045`		`- if (speedInfo.MaxTempSpeedMpSLimit > 0 && !Simulator.TimetableMode)`
	`11045`	`+ if (speedInfo.MaxTempSpeedMpSLimit > 0)`
`11046`	`11046`	`{`
`11047`	`11047`	`allowedMaxTempSpeedLimitMpS = allowedAbsoluteMaxTempSpeedLimitMpS;`
`11048`	`11048`	`AllowedMaxSpeedMpS = Math.Min(speedInfo.MaxTempSpeedMpSLimit, Math.Min(allowedMaxSpeedSignalMpS, allowedMaxSpeedLimitMpS));`