Merge pull request #791 from Roeterdink/CorrectSwitchstand

Correct update for Switchstand signalscript function

Author: cjakeman

Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs

@@ -1405,7 +1405,13 @@ public int SH_function_value(SignalHead thisHead, SignalScripts.SCRScripts.SCRSt
                 // switchstand
 
                 case SignalScripts.SCRExternalFunctions.SWITCHSTAND:
-                    return_value = thisHead.switchstand(parameter1_value, parameter2_value);
+#if DEBUG_PRINT_PROCESS
+                    if (TDB_debug_ref.Contains(thisHead.TDBIndex) || OBJ_debug_ref.Contains(thisHead.mainSignal.thisRef))
+                    {
+                        dumpfile = String.Concat(dpr_fileLoc, "printproc.txt");
+                    }
+#endif
+                    return_value = thisHead.switchstand(parameter1_value, parameter2_value, dumpfile);
                     break;
 
                 // def_draw_state

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

@@ -307,9 +307,9 @@ public int id_sig_hasnormalsubtype(int sigId, int reqSubtype)
             return 0;
         }
 
-        public int switchstand(int aspect1, int aspect2)
+        public int switchstand(int aspect1, int aspect2, string dumpfile)
         {
-            return mainSignal.switchstand(aspect1, aspect2);
+            return mainSignal.switchstand(aspect1, aspect2, dumpfile);
         }
 
         /// <summary>

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

@@ -1159,7 +1159,7 @@ public int this_sig_hasnormalsubtype(int reqSubtype)
         /// <summary>
         /// switchstand : link signal with next switch and set aspect according to switch state
         /// </summary>
-        public int switchstand(int aspect1, int aspect2)
+        public int switchstand(int aspect1, int aspect2, string dumpfile)
         {
             // if switch index not yet set, find first switch in path
             if (!nextSwitchIndex.HasValue)
@@ -1206,13 +1206,23 @@ public int switchstand(int aspect1, int aspect2)
 
                 if (!switchFound)
                 {
+                    if (dumpfile.Length > 1)
+                    {
+                        File.AppendAllText(dumpfile, "SWITCHSTAND : no switch found /n");
+                    }
                     nextSwitchIndex = -1;
                 }
             }
 
             if (nextSwitchIndex >= 0)
             {
                 TrackCircuitSection switchSection = signalRef.TrackCircuitList[nextSwitchIndex.Value];
+                if (dumpfile.Length > 1)
+                {
+                    File.AppendAllText(dumpfile,
+                        String.Format("SWITCHSTAND : switch found : {0}, switch state {1} \n", switchSection.Index, switchSection.JunctionLastRoute));
+                }
+
                 return switchSection.JunctionLastRoute == 0 ? aspect1 : aspect2;
             }
 

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

@@ -3011,13 +3011,13 @@ public void setSwitch(int nodeIndex, int switchPos, TrackCircuitSection thisSect
             thisNode.TrJunctionNode.SelectedRoute = switchPos;
             thisSection.JunctionLastRoute = switchPos;
 
-            // update any linked signals
+            // update any linked signals - perform state update only (to avoid problems with route setting)
             if (thisSection.LinkedSignals != null)
             {
                 foreach (int thisSignalIndex in thisSection.LinkedSignals)
                 {
                     SignalObject thisSignal = SignalObjects[thisSignalIndex];
-                    thisSignal.Update();
+                    thisSignal.StateUpdate();
                 }
             }
         }