Merge pull request #700 from Sharpe49/csharp-script-extensions

Fix for crash during signal loading

Author: Sharpe49

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

@@ -8140,7 +8140,7 @@ public TCSubpathRoute CheckManualPath(int direction, TCPosition requiredPosition
             bool hasEndSignal = false;     // ends with cleared signal
             int sectionWithSignalIndex = 0;
 
-            SignalObject previousSignal = new SignalObject(signalRef);
+            SignalObject previousSignal = new SignalObject(signalRef, SignalObjectType.Signal);
 
             for (int iindex = 0; iindex < newRoute.Count && !endWithSignal; iindex++)
             {

Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs

@@ -90,20 +90,7 @@ public enum Permission
         public int thisRef;                     // This signal's reference.
         public int direction;                   // Direction facing on track
 
-        public SignalObjectType Type
-        {
-            get
-            {
-                if (SignalHeads.Exists(x => x.Function.MstsFunction != MstsSignalFunction.SPEED))
-                {
-                    return SignalObjectType.Signal;
-                }
-                else
-                {
-                    return SpeedPostWorldObject != null ? SignalObjectType.SpeedPost : SignalObjectType.SpeedSignal;
-                }
-            }
-        }
+        public SignalObjectType Type { get; protected set; }
         public List<SignalHead> SignalHeads = new List<SignalHead>();
 
         public int SignalNumClearAhead_MSTS = -2;    // Overall maximum SignalNumClearAhead over all heads (MSTS calculation)
@@ -203,10 +190,12 @@ public int revDir                //  Needed because signal faces train!
         /// <summary>
         ///  Constructor for empty item
         /// </summary>
-        public SignalObject(Signals signalReference)
+        public SignalObject(Signals signalReference, SignalObjectType type)
         {
             signalRef = signalReference;
 
+            Type = type;
+
             LockedTrains = new List<KeyValuePair<int, int>>();
 
             foreach (SignalFunction function in signalRef.SignalFunctions.Values)
@@ -222,7 +211,18 @@ public SignalObject(Signals signalReference)
         public SignalObject(SignalObject copy)
         {
             signalRef = copy.signalRef;
-            WorldObject = new SignalWorldObject(copy.WorldObject);
+            Type = copy.Type;
+            switch (Type)
+            {
+                case SignalObjectType.Signal:
+                case SignalObjectType.SpeedSignal:
+                    WorldObject = new SignalWorldObject(copy.WorldObject);
+                    break;
+
+                case SignalObjectType.SpeedPost:
+                    SpeedPostWorldObject = new SpeedPostWorldObject(copy.SpeedPostWorldObject);
+                    break;
+            }
 
             trackNode = copy.trackNode;
             LockedTrains = new List<KeyValuePair<int, int>>();
@@ -1881,6 +1881,12 @@ public void SetSignalType(SignalConfigurationFile sigCFG)
             {
                 sigHead.SetSignalType(trItems, sigCFG);
             }
+
+            if (Type == SignalObjectType.Signal
+                && !SignalHeads.Exists(x => x.Function.MstsFunction != MstsSignalFunction.SPEED))
+            {
+                Type = SignalObjectType.SpeedSignal;
+            }
         }
 
         public void Initialize()

Source/Orts.Simulation/Simulation/Signalling/Signals.cs

@@ -26,6 +26,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using Microsoft.Xna.Framework;
 using Orts.Formats.Msts;
 using Orts.Formats.OR;
@@ -182,11 +183,6 @@ public Signals(Simulator simulator, SignalConfigurationFile sigcfg, Cancellation
                         sob.AppendFormat("TDB  Index          : {0}\n", thisHead.TDBIndex);
                         sob.AppendFormat("Junction Main Node  : {0}\n", thisHead.JunctionMainNode);
                         sob.AppendFormat("Junction Path       : {0}\n", thisHead.JunctionPath);
-
-                        if (thisHead.usedCsSignalScript == null && singleSignal.Type == SignalObjectType.Signal)
-                        {
-                            nonCSharpSignals.Add(thisHead.signalType.Name);
-                        }
                     }
 
                     sob.AppendFormat("TC Reference   : {0}\n", singleSignal.TCReference);
@@ -1010,7 +1006,7 @@ private int AddSignal(int trackNode, int nodeIndx, SignalItem sigItem, int TDBRe
         {
             validSignal = true;
 
-            SignalObjects[foundSignals] = new SignalObject(this);
+            SignalObjects[foundSignals] = new SignalObject(this, SignalObjectType.Signal);
             SignalObjects[foundSignals].direction = (int)sigItem.Direction;
             SignalObjects[foundSignals].trackNode = trackNode;
             SignalObjects[foundSignals].trRefIndex = nodeIndx;
@@ -1056,7 +1052,7 @@ private int AddSignal(int trackNode, int nodeIndx, SignalItem sigItem, int TDBRe
         /// </summary>
         private int AddSpeed(int trackNode, int nodeIndx, SpeedPostItem speedItem, int TDBRef, TrackSectionsFile tsectiondat, TrackDatabaseFile tdbfile)
         {
-            SignalObjects[foundSignals] = new SignalObject(this);
+            SignalObjects[foundSignals] = new SignalObject(this, SignalObjectType.SpeedPost);
             SignalObjects[foundSignals].direction = 0;                  // preset - direction not yet known //
             SignalObjects[foundSignals].trackNode = trackNode;
             SignalObjects[foundSignals].trRefIndex = nodeIndx;

Source/Orts.Simulation/Simulation/Signalling/SpeedPostWorldObject.cs

@@ -12,5 +12,10 @@ public SpeedPostWorldObject(SpeedPostObj speedPostItem)
             // get filename in Uppercase
             SFileName = Path.GetFileName(speedPostItem.FileName).ToUpperInvariant();
         }
+
+        public SpeedPostWorldObject(SpeedPostWorldObject other)
+        {
+            SFileName = other.SFileName;
+        }
     }
 }