Merge pull request #777 from Roeterdink/SaveRestoreActionClearMovingTable

Save and restore ClearMovingTable action (for timetables)

Author: cjakeman

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

@@ -5298,7 +5298,7 @@ public override void PerformActions(List<DistanceTravelledItem> nowActions)
                 }
                 else if (thisAction is ClearMovingTableAction)
                 {
-                    ClearMovingTable();
+                    ClearMovingTable(thisAction);
                 }
                 else if (thisAction is AIActionItem && !(thisAction is AuxActionItem))
                 {

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

@@ -904,6 +904,10 @@ public Train(Simulator simulator, BinaryReader inf)
                         requiredActions.InsertAction(auxAction);
                         Trace.TraceWarning("DistanceTravelledItem type 4 restored as AuxActionItem");
                         break;
+                    case 5:
+                        ClearMovingTableAction cmtAction = new ClearMovingTableAction(inf);
+                        requiredActions.InsertAction(cmtAction);
+                        break;
                     default:
                         Trace.TraceWarning("Unknown type of DistanceTravelledItem (type {0}",
                                 actionType.ToString());
@@ -16236,7 +16240,7 @@ public virtual bool CheckPoolAccess(int sectionIndex)
         /// Clear moving table after moving table actions
         /// Dummy method to allow virtualization by child classes
         /// </summary>
-        public virtual void ClearMovingTable()
+        public virtual void ClearMovingTable(DistanceTravelledItem action)
         {
         }
 
@@ -20348,6 +20352,13 @@ public void Save(BinaryWriter outf)
                     AuxActionItem thisAction = this as AuxActionItem;
                     thisAction.SaveItem(outf);
                 }
+                else if (this is ClearMovingTableAction)
+                {
+                    outf.Write(5);
+                    outf.Write(RequiredDistance);
+                    ClearMovingTableAction thisAction = this as ClearMovingTableAction;
+                    thisAction.SaveItem(outf);
+                }
                 else
                 {
                     outf.Write(-1);

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

@@ -6518,13 +6518,20 @@ public override void UpdateSectionState_Additional(int sectionIndex)
         /// Clear moving table after moving off table
         /// </summary>
 
-        public override void ClearMovingTable()
+        public override void ClearMovingTable(DistanceTravelledItem action)
         {
             // only if valid reference
             if (ActiveTurntable != null)
             {
                 ActiveTurntable.RemoveTrainFromTurntable();
                 ActiveTurntable = null;
+
+                // set action to restore original speed
+                ClearMovingTableAction clearAction = action as ClearMovingTableAction;
+
+                float reqDistance = DistanceTravelledM + 1;
+                ActivateSpeedLimit speedLimit = new ActivateSpeedLimit((DistanceTravelledM + 1), clearAction.OriginalMaxTrainSpeedMpS, clearAction.OriginalMaxTrainSpeedMpS, clearAction.OriginalMaxTrainSpeedMpS);
+                requiredActions.InsertAction(speedLimit);
             }
         }
 
@@ -9246,7 +9253,7 @@ public override void ProcessEndOfPathReached(ref bool[] returnValue, int present
             List<DistanceTravelledItem> reqActions = requiredActions.GetActions(0.0f, typeof(ClearMovingTableAction));
             foreach (DistanceTravelledItem thisAction in reqActions)
             {
-                ClearMovingTable();
+                ClearMovingTable(thisAction);
             }
 
             // check if train is to form new train