NoSpeedUpdate signal option

Author: Roeterdink

Source/Orts.Formats.Msts/SignalConfigurationFile.cs

@@ -1052,6 +1052,8 @@ public class SignalAspect
         public float SpeedMpS { get; private set; }
         /// <summary>Set to true if SignalFlags ASAP option specified, meaning train needs to go to speed As Soon As Possible</summary>
         public bool Asap { get; private set; }
+        /// <summary>Set to true if SignalFlags NoSpeedUpdate option specified, meaning speed limits are not in any way affected by the state of this signal>
+        public bool NoSpeedUpdate { get; private set; }
         /// <summary>Set to true if SignalFlags RESET option specified (ORTS only)</summary>
         public bool Reset; 
         /// <summary>Set to true if no speed reduction is required for RESTRICTED or STOP_AND_PROCEED aspects (ORTS only) </summary>
@@ -1068,6 +1070,7 @@ public SignalAspect(MstsSignalAspect reqAspect, string reqName)
             DrawStateName = String.Copy(reqName);
             SpeedMpS = -1;
             Asap = false;
+            NoSpeedUpdate = false;
             NoSpeedReduction = false;
         }
 
@@ -1099,6 +1102,7 @@ public SignalAspect(STFReader stf)
                         switch (stf.ReadString().ToLower())
                         {
                             case "asap": Asap = true; break;
+                            case "nospeedupdate": NoSpeedUpdate = true; break;
                             case "or_speedreset": Reset = true; break;
                             case "or_nospeedreduction": NoSpeedReduction = true; break;
                             default: stf.StepBackOneItem(); STFException.TraceInformation(stf, "Skipped unknown DrawLight flag " + stf.ReadString()); break;

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -7007,6 +7007,7 @@ public static ObjectItemInfo RestoreActiveItem(BinaryReader inf, Signals signalR
             thisInfo.speed_passenger = inf.ReadSingle();
             thisInfo.speed_freight = inf.ReadSingle();
             thisInfo.speed_flag = inf.ReadInt32();
+            thisInfo.no_speedUpdate = inf.ReadInt32();
             thisInfo.actual_speed = inf.ReadSingle();
 
             thisInfo.processed = inf.ReadBoolean();
@@ -7059,6 +7060,7 @@ public static void SaveActiveItem(BinaryWriter outf, ObjectItemInfo ActiveItem)
             outf.Write(ActiveItem.speed_passenger);
             outf.Write(ActiveItem.speed_freight);
             outf.Write(ActiveItem.speed_flag);
+            outf.Write(ActiveItem.no_speedUpdate);
             outf.Write(ActiveItem.actual_speed);
 
             outf.Write(ActiveItem.processed);

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -3513,6 +3513,7 @@ public void UpdateSignalState(int backward)
                         firstObject.speed_passenger = thisSpeed?.speed_pass ?? -1;
                         firstObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                         firstObject.speed_flag = thisSpeed?.speed_flag ?? 0;
+                        firstObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                         firstObject.speed_reset = thisSpeed?.speed_reset ?? 0;
                         break;
 
@@ -3523,6 +3524,7 @@ public void UpdateSignalState(int backward)
                         firstObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                         firstObject.speed_flag = thisSpeed?.speed_flag ?? 0;
                         firstObject.speed_reset = thisSpeed?.speed_reset ?? 0;
+                        firstObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                         firstObject.speed_noSpeedReductionOrIsTempSpeedReduction = thisSpeed?.speed_noSpeedReductionOrIsTempSpeedReduction ?? 0;
                         firstObject.speed_isWarning = thisSpeed?.speed_isWarning ?? false;
                         break;
@@ -3552,13 +3554,15 @@ public void UpdateSignalState(int backward)
                                 nextObject.speed_passenger = -1;
                                 nextObject.speed_freight = -1;
                                 nextObject.speed_flag = 0;
+                                nextObject.no_speedUpdate = 0;
                                 nextObject.speed_reset = 0;
                             }
                             else
                             {
                                 nextObject.speed_passenger = thisSpeed?.speed_pass ?? -1;
                                 nextObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                                 nextObject.speed_flag = thisSpeed?.speed_flag ?? 0;
+                                nextObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                                 nextObject.speed_reset = thisSpeed?.speed_reset ?? 0;
                             }
                             break;
@@ -3569,6 +3573,7 @@ public void UpdateSignalState(int backward)
                             nextObject.speed_passenger = thisSpeed?.speed_pass ?? -1;
                             nextObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                             nextObject.speed_flag = thisSpeed?.speed_flag ?? 0;
+                            nextObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                             nextObject.speed_reset = thisSpeed?.speed_reset ?? 0;
                             nextObject.speed_noSpeedReductionOrIsTempSpeedReduction = thisSpeed?.speed_noSpeedReductionOrIsTempSpeedReduction ?? 0;
                             nextObject.speed_isWarning = thisSpeed?.speed_isWarning ?? false;
@@ -3644,6 +3649,7 @@ public void UpdateSignalState(int backward)
                                 nextObject.speed_passenger = thisSpeed?.speed_pass ?? -1;
                                 nextObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                                 nextObject.speed_flag = thisSpeed?.speed_flag ?? 0;
+                                nextObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                                 nextObject.speed_reset = thisSpeed?.speed_reset ?? 0;
                                 break;
 
@@ -3653,6 +3659,7 @@ public void UpdateSignalState(int backward)
                                 nextObject.speed_passenger = thisSpeed?.speed_pass ?? -1;
                                 nextObject.speed_freight = thisSpeed?.speed_freight ?? -1;
                                 nextObject.speed_flag = thisSpeed?.speed_flag ?? 0;
+                                nextObject.no_speedUpdate = thisSpeed?.no_speedUpdate ?? 0;
                                 nextObject.speed_reset = thisSpeed?.speed_reset ?? 0;
                                 nextObject.speed_noSpeedReductionOrIsTempSpeedReduction = thisSpeed?.speed_noSpeedReductionOrIsTempSpeedReduction ?? 0;
                                 nextObject.speed_isWarning = thisSpeed?.speed_isWarning ?? false;
@@ -3820,7 +3827,7 @@ public void UpdateSpeedInfo()
 #endif
                         }
                     }
-                    else
+                    else if (thisObject.no_speedUpdate == 1)
                     {
                         validSpeedSignalMpS = TrainMaxSpeedMpS;
                         float newSpeedMpS = Math.Min(validSpeedSignalMpS, Math.Min(validSpeedLimitMpS, validTempSpeedLimitMpS));

Source/Orts.Simulation/Simulation/Signalling/ObjectItemInfo.cs

@@ -57,6 +57,7 @@ public enum ObjectItemFindState
         public int speed_reset;
         // for signals: if = 1 no speed reduction; for speedposts: if = 0 standard; = 1 start of temp speedreduction post; = 2 end of temp speed reduction post
         public int speed_noSpeedReductionOrIsTempSpeedReduction;
+        public int no_speedUpdate;
         public bool speed_isWarning;
         public float actual_speed;                   // set active by TRAIN
 
@@ -78,6 +79,7 @@ public ObjectItemInfo(SignalObject thisObject, float distance)
                 speed_passenger = -1;                      // set active by TRAIN
                 speed_freight = -1;                      // set active by TRAIN
                 speed_flag = 0;                       // set active by TRAIN
+                no_speedUpdate = 0;                     // set active by TRAIN 
                 speed_reset = 0;                      // set active by TRAIN
                 speed_noSpeedReductionOrIsTempSpeedReduction = 0;
             }
@@ -89,6 +91,7 @@ public ObjectItemInfo(SignalObject thisObject, float distance)
                 speed_passenger = speed_info.speed_pass;
                 speed_freight = speed_info.speed_freight;
                 speed_flag = speed_info.speed_flag;
+                no_speedUpdate = speed_info.no_speedUpdate;
                 speed_reset = speed_info.speed_reset;
                 speed_noSpeedReductionOrIsTempSpeedReduction = speed_info.speed_noSpeedReductionOrIsTempSpeedReduction;
                 speed_isWarning = speed_info.speed_isWarning;

Source/Orts.Simulation/Simulation/Signalling/ObjectSpeedInfo.cs

@@ -22,16 +22,18 @@ public class ObjectSpeedInfo
         public float speed_pass;
         public float speed_freight;
         public int speed_flag;
+        public int no_speedUpdate;
         public int speed_reset;
         public int speed_noSpeedReductionOrIsTempSpeedReduction;
         public bool speed_isWarning;
 
-        public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction, bool isWarning)
+        public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction, bool isWarning, bool nospeedupdate = false)
         {
             speed_pass = pass;
             speed_freight = freight;
             speed_flag = asap ? 1 : 0;
             speed_reset = reset ? 1 : 0;
+            no_speedUpdate = nospeedupdate ? 1 : 0;
             speed_noSpeedReductionOrIsTempSpeedReduction = nospeedreductionOristempspeedreduction;
             speed_isWarning = isWarning;
         }

Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs

@@ -99,7 +99,8 @@ public SignalHead(SignalObject sigObject, int trItem, int TDBRef, SpeedPostItem
 
             float passSpeed = speedItem.IsPassenger ? speedMpS : -1;
             float freightSpeed = speedItem.IsFreight ? speedMpS : -1;
-            ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem ? (speedMpS == 999f ? 2 : 1) : 0, speedItem.IsWarning);
+            ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem ? (speedMpS == 999f ? 2 : 1) : 0,
+                                  speedItem.IsWarning);
             speed_info[(int)state] = speedinfo;
         }
 
@@ -128,7 +129,8 @@ public void SetSignalType(TrItem[] TrItems, SignalConfigurationFile sigCFG)
                     foreach (SignalAspect thisAspect in signalType.Aspects)
                     {
                         int arrindex = (int)thisAspect.Aspect;
-                        speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, thisAspect.NoSpeedReduction ? 1 : 0, false);
+                        speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, 
+                            thisAspect.NoSpeedReduction ? 1 : 0, false, thisAspect.NoSpeedUpdate);
                     }
 
                     // set normal subtype