Merge branch 'master' into gltf2

Author: pzgulyas

Source/Documentation/Manual/compatibility.rst

@@ -129,7 +129,7 @@ Within the ``\GLOBAL`` folder two sub-folders are required::
 Within the ``\TRAINS`` folder two subfolders are required::
 
     \CONSISTS
-    \TRAINSETS
+    \TRAINSET
 
 Original MSTS Files Usually Needed for Added MSTS-Compatible Content
 ====================================================================

Source/Documentation/Manual/features-route.rst

@@ -208,6 +208,18 @@ TrackShape block within the tsection.dat file. You only have to insert the diame
 the turntable and the degree step. Of course you have to take only the lines up to the 
 one preceding the one with degrees = 180.
 
+Also turntables which may rotate less than 360 degrees can be implemented, like the one in 
+the picture here below:
+
+.. image:: images/features-partial-turntable.png
+
+In this case following line has to be added at the end of the ``Turntable()`` block 
+in file ``turntables.dat`` for a turntable that can rotate only between 0 and 40 degrees::
+
+  MaxAngle ( 40 )
+
+Angles increase clockwise.
+
 Already many existing turntables have been successfully animated and many new other
 have been created. More can be read 
 `in this forum thread <http://www.elvastower.com/forums/index.php?/topic/28591-operational-turntable/>`_ .

Source/Documentation/Manual/images/features-partial-turntable.png

@@ -86,7 +86,7 @@ called an *MSTS installation* for convenience, even if this wording is not
 completely correct. 
 
 A proof that Open Rails itself does not need an MSTS installation at all to 
-run is `this route <http://www.burrinjuck.coalstonewcastle.com.au/route/route-install/>`.
+run is `this route <http://www.burrinjuck.coalstonewcastle.com.au/route/route-install/>`_ (Burrinjuck Railway).
 
 Community
 =========

Source/Documentation/Manual/intro.rst

@@ -160,13 +160,13 @@ information of train positions. If two player trains couple together, one of
 them will become a helper, and a message will be shown on the left indicating 
 that the player is in Helper mode.  A player in Helper mode cannot control 
 his consist as it falls under control of the lead locomotive. By pressing 
-``<Shift+E>`` you can swap Helper status with another player on the train. 
+``<Alt+E>`` you can swap Helper status with another player on the train. 
 Always press ``<\>`` and ``<Shift+/>`` to reset brakes each time after 
 coupling/uncoupling. Note that two trains can't couple together before two 
 minutes are passed from their presence in the Dispatcher's computer.
 
 Players can uncouple their own trains. Players in the uncoupled trains may 
-need to press ``<Shift+E>`` to gain control; otherwise, the uncoupled 
+need to press ``<Alt+E>`` to gain control; otherwise, the uncoupled 
 trains may become a loose consist. Always stop completely before uncoupling, 
 otherwise weird things may happen. Players may also need to press keys for 
 resetting brake state after uncoupling (see :ref:`here <driving-brakes-init>`).
@@ -248,7 +248,7 @@ Summary of Multi-Player Procedures
 8.  Use ``<\>`` and ``<Shift+/>`` (on English keyboards) just after your 
     train is coupled or uncoupled, or when you just gain back the control of 
     your own train.
-9.  Use ``<Shift+E>`` to gain control of your own train after uncoupling.
+9.  Use ``<Alt+E>`` to gain control of your own train after uncoupling.
 10. Use other communication tools (such as Ventrillo or Skype) to communicate 
     with other players.
 11. Always completely stop before uncoupling trains with two players coupled 

Source/Documentation/Manual/multiplayer.rst

@@ -1114,7 +1114,8 @@ public ApproachControlLimits(STFReader stf)
                 new STFReader.TokenProcessor("positionyd", ()=>{ ApproachControlPositionM = Me.FromYd(stf.ReadFloatBlock(STFReader.UNITS.None, 0)); }),
                 new STFReader.TokenProcessor("speedmph", ()=>{ ApproachControlSpeedMpS = MpS.FromMpH(stf.ReadFloatBlock(STFReader.UNITS.None, 0)); }),
                 new STFReader.TokenProcessor("speedkph", ()=>{ ApproachControlSpeedMpS = MpS.FromKpH(stf.ReadFloatBlock(STFReader.UNITS.None, 0)); }),
-                });
+                new STFReader.TokenProcessor("speedmps", ()=>{ ApproachControlSpeedMpS = stf.ReadFloatBlock(STFReader.UNITS.None, 0); }),
+              });
         }
     }
 

Source/Orts.Formats.Msts/SignalConfigurationFile.cs

@@ -1159,54 +1159,13 @@ private bool AddToWorldTT(TTTrain thisTrain, List<TTTrain> nextTrains)
                 int presentTime = Convert.ToInt32(Math.Floor(clockTime));
                 TimetablePool thisPool = Simulator.PoolHolder.Pools[thisTrain.CreateInPool];
 
-                int PoolStorageState = (int)TTTrain.PoolAccessState.PoolInvalid;
-                thisTrain.TCRoute.TCRouteSubpaths[0] = thisPool.CreateInPool(thisTrain, out PoolStorageState, false);
-                thisTrain.ValidRoute[0] = new Train.TCSubpathRoute(thisTrain.TCRoute.TCRouteSubpaths[0]);
-                thisTrain.TCRoute.activeSubpath = 0;
+                int PoolStorageState = thisPool.CreateInPool(thisTrain, nextTrains);
 
-                // if no storage available - abondone train
                 if (PoolStorageState < 0)
                 {
                     Trace.TraceInformation("Train : " + thisTrain.Name + " : no storage room available in pool : " + thisPool.PoolName + " ; engine not created");
                     return (endPreRun);
                 }
-
-                // use stored traveller
-                thisTrain.PoolStorageIndex = PoolStorageState;
-                thisTrain.RearTDBTraveller = new Traveller(thisPool.StoragePool[thisTrain.PoolStorageIndex].StoragePathTraveller);
-
-                // if storage available check for other engines on storage track
-                if (thisPool.StoragePool[thisTrain.PoolStorageIndex].StoredUnits.Count > 0)
-                {
-                    int lastTrainNumber = thisPool.StoragePool[thisTrain.PoolStorageIndex].StoredUnits[thisPool.StoragePool[thisTrain.PoolStorageIndex].StoredUnits.Count - 1];
-                    TTTrain lastTrain = thisTrain.GetOtherTTTrainByNumber(lastTrainNumber);
-                    if (lastTrain == null)
-                    {
-                        lastTrain = thisTrain.Simulator.GetAutoGenTTTrainByNumber(lastTrainNumber);
-                    }
-                    if (lastTrain != null)
-                    {
-                        thisTrain.CreateAhead = String.Copy(lastTrain.Name).ToLower();
-                    }
-                }
-
-                tempRoute = thisTrain.CalculateInitialTTTrainPosition(ref validPosition, nextTrains);
-
-                if (validPosition)
-                {
-                    thisTrain.SetInitialTrainRoute(tempRoute);
-                    thisTrain.CalculatePositionOfCars();
-                    for (int i = 0; i < thisTrain.Cars.Count; i++)
-                        thisTrain.Cars[i].WorldPosition.XNAMatrix.M42 -= 1000;
-                    thisTrain.ResetInitialTrainRoute(tempRoute);
-
-                    // set train route and position so proper position in pool can be calculated
-                    thisTrain.UpdateTrainPosition();
-
-                    // add unit to pool
-                    thisPool.AddUnit(thisTrain, false);
-                    validPosition = thisTrain.PostInit(false); // post init train but do not activate
-                }
             }
 
             // clear track and align switches - check state
@@ -1408,6 +1367,12 @@ public class StartTrains : LinkedList<AITrain>
 
         public void InsertTrain(AITrain thisTrain)
         {
+            if (thisTrain.StartTime == null)
+            {
+                Trace.TraceInformation("Train : " + thisTrain.Name + " : missing start time, train not included");
+                return;
+            }
+            
             if (this.Count == 0)
             {
                 this.AddFirst(thisTrain);
@@ -1554,11 +1519,11 @@ public TTTrain GetNotStartedTTTrainByNumber(int reqNumber, bool remove)
             LinkedListNode<AITrain> AITrainNode = First;
             while (AITrainNode != null)
             {
-                if (AITrainNode.Value.Number == reqNumber)
+                TTTrain tttrain = AITrainNode.Value as TTTrain;
+                if (tttrain.Number == reqNumber || tttrain.OrgAINumber == reqNumber)
                 {
-                    TTTrain reqTrain = AITrainNode.Value as TTTrain;
                     if (remove) Remove(AITrainNode);
-                    return (reqTrain);
+                    return (tttrain);
                 }
                 else
                 {

Source/Orts.Simulation/Simulation/AIs/AI.cs

@@ -680,6 +680,7 @@ public class AIAuxActionsRef : AuxActionRef
         public float RequiredSpeedMpS;
         public float RequiredDistance;
         public int Delay;
+        public int OriginalDelay;
         public int EndSignalIndex { get; protected set; }
 
         public AUX_ACTION NextAction = AUX_ACTION.NONE;
@@ -888,6 +889,7 @@ public AIActionWPRef(Train thisTrain, BinaryReader inf)
             : base (thisTrain, inf)
         {
             Delay = inf.ReadInt32();
+            OriginalDelay = inf.ReadInt32();
             NextAction = AUX_ACTION.WAITING_POINT;
 #if WITH_PATH_DEBUG
             File.AppendAllText(@"C:\temp\checkpath.txt", "\tRestore one WPAuxAction" +
@@ -915,6 +917,7 @@ public override void save(BinaryWriter outf, int cnt)
 #endif
             base.save(outf, cnt);
             outf.Write(Delay);
+            outf.Write(OriginalDelay);
         }
 
         public override AIActionItem Handler(params object[] list)
@@ -2733,4 +2736,4 @@ public override AITrain.AI_MOVEMENT_STATE ProcessAction(Train thisTrain, int pre
     }
 
 #endregion
-}
+}

Source/Orts.Simulation/Simulation/AIs/AIAuxAction.cs

@@ -684,7 +684,7 @@ public void AIUpdate(float elapsedClockSeconds, double clockTime, bool preUpdate
 
             if (MovementState == AI_MOVEMENT_STATE.AI_STATIC)
             {
-                physicsUpdate(0);   //required to make train visible ; set elapsed time to zero to avoid actual movement
+                CalculatePositionOfCars(0, 0);   //required to make train visible ; set elapsed time to zero to avoid actual movement
             }
             else
             {
@@ -4027,6 +4027,7 @@ public void BuildWaitingPointList(float clearingDistanceM)
                             RandomizedWPDelay(ref randomizedDelay);
                         }
                         action.SetDelay(randomizedDelay);
+                        action.OriginalDelay = action.Delay;
                         AuxActionsContain.Add(action);
                         if (insertSigDelegate && (waitingPoint[2] != 60002) && signalIndex[iWait] > -1)
                         {
@@ -5100,6 +5101,32 @@ public void CreateTrainAction(float presentSpeedMpS, float reqSpeedMpS, float di
             // correct trigger for approach distance but not backward beyond present position
             triggerDistanceM = Math.Max(PresentPosition[0].DistanceTravelledM, triggerDistanceM - (3.0f * signalApproachDistanceM));
 
+            // for signal stop item : check if action allready in list, if so, remove (can be result of restore action)
+            LinkedListNode<DistanceTravelledItem> thisItemLink = requiredActions.First;
+            bool itemFound = false;
+
+            while (thisItemLink != null && !itemFound)
+            {
+                DistanceTravelledItem thisDTItem = thisItemLink.Value;
+                if (thisDTItem is AIActionItem)
+                {
+                    AIActionItem thisActionItem = thisDTItem as AIActionItem;
+                    if (thisActionItem.ActiveItem != null && thisActionItem.NextAction == thisAction)
+                    {
+                        if (thisActionItem.ActiveItem.ObjectDetails.thisRef == thisItem.ObjectDetails.thisRef)
+                        {
+                            // equal item, so remove it
+                            requiredActions.Remove(thisDTItem);
+                            itemFound = true;
+                        }
+                    }
+                }
+                if (!itemFound)
+                {
+                    thisItemLink = thisItemLink.Next;
+                }
+            }
+
             // create and insert action
 
             AIActionItem newAction = new AIActionItem(thisItem, thisAction);
@@ -5298,7 +5325,7 @@ public override void PerformActions(List<DistanceTravelledItem> nowActions)
                 }
                 else if (thisAction is ClearMovingTableAction)
                 {
-                    ClearMovingTable();
+                    ClearMovingTable(thisAction);
                 }
                 else if (thisAction is AIActionItem && !(thisAction is AuxActionItem))
                 {
@@ -5345,7 +5372,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));
@@ -5453,22 +5480,41 @@ public void ProcessActionItem(AIActionItem thisItem)
                 if (thisItem.ActiveItem.signal_state == MstsSignalAspect.STOP &&
                     thisItem.ActiveItem.ObjectDetails.holdState == HoldState.StationStop)
                 {
-                    actionValid = false;
+                    // check if train is approaching or standing at station and has not yet departed
+                    if (StationStops != null && StationStops.Count >= 1 && AtStation && StationStops[0].ExitSignal == thisItem.ActiveItem.ObjectDetails.thisRef)
+                    {
+                        actionValid = false;
 
 #if DEBUG_REPORTS
                     File.AppendAllText(@"C:\temp\printproc.txt", "Train " +
                             Number.ToString() + " : signal " +
                             thisItem.ActiveItem.ObjectDetails.thisRef.ToString() + " at " +
                             thisItem.ActivateDistanceM.ToString() + " is held for station stop\n");
 #endif
-                    if (CheckTrain)
+                        if (CheckTrain)
+                        {
+                            File.AppendAllText(@"C:\temp\checktrain.txt", "Train " +
+                                    Number.ToString() + " : signal " +
+                                    thisItem.ActiveItem.ObjectDetails.thisRef.ToString() + " at " +
+                                    thisItem.ActivateDistanceM.ToString() + " is held for station stop\n");
+                        }
+                    }
+                    else
                     {
-                        File.AppendAllText(@"C:\temp\checktrain.txt", "Train " +
-                                Number.ToString() + " : signal " +
-                                thisItem.ActiveItem.ObjectDetails.thisRef.ToString() + " at " +
-                                thisItem.ActivateDistanceM.ToString() + " is held for station stop\n");
+#if DEBUG_REPORTS
+                        File.AppendAllText(@"C:\temp\printproc.txt", "Train " +
+                            Number.ToString() + " : signal " +
+                            thisItem.ActiveItem.ObjectDetails.thisRef.ToString() + " at " +
+                            thisItem.ActivateDistanceM.ToString() + " is held for station stop but train is no longer stopped in station\n");
+#endif
+                        if (CheckTrain)
+                        {
+                            File.AppendAllText(@"C:\temp\checktrain.txt", "Train " +
+                                    Number.ToString() + " : signal " +
+                                    thisItem.ActiveItem.ObjectDetails.thisRef.ToString() + " at " +
+                                    thisItem.ActivateDistanceM.ToString() + " is held for station stop but train is no longer stopped in station\n");
+                        }
                     }
-
                 }
 
                 // check if cleared
@@ -6640,7 +6686,7 @@ public void RestartWaitingTrain(RestartWaitingTrain restartWaitingTrain)
             var matchingWPDelay = restartWaitingTrain.MatchingWPDelay;
             int presentTime = Convert.ToInt32(Math.Floor(Simulator.ClockTime));
             var roughActualDepart = presentTime + delayToRestart;
-            if (MovementState == AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION && (((nextActionInfo as AuxActionWPItem).ActionRef as AIActionWPRef).Delay == matchingWPDelay ||
+            if (MovementState == AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION && (((nextActionInfo as AuxActionWPItem).ActionRef as AIActionWPRef).OriginalDelay == matchingWPDelay ||
                 (AuxActionsContain.specRequiredActions.Count > 0 && ((AuxActSigDelegate)(AuxActionsContain.specRequiredActions).First.Value).currentMvmtState == AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION &&
                 (((AuxActSigDelegate)(AuxActionsContain.specRequiredActions).First.Value).ActionRef as AIActSigDelegateRef).Delay == matchingWPDelay)))
             {