Merge pull request #712 from cesarBLG/fix-null-fntype

cesarBLG · web-flow · commit 77be597b928d · 2022-10-14T09:25:23.000+02:00
Search for NORMAL signals if no argument is provided
diff --git a/Source/Orts.Formats.Msts/SignalScripts.cs b/Source/Orts.Formats.Msts/SignalScripts.cs
@@ -2513,6 +2513,7 @@ public SCRParameterType(SCRTermType TypeIn, int IntIn)
                 {
                     PartType = TypeIn;
                     PartParameter = IntIn;
+                    if (Enum.IsDefined(typeof(MstsSignalFunction), IntIn)) SignalFunction = new SignalFunction((MstsSignalFunction)IntIn);
                 }
 
                 // <summary>
diff --git a/Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs b/Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs
@@ -516,8 +516,8 @@ public int SH_function_value(SignalHead thisHead, SignalScripts.SCRScripts.SCRSt
             int return_value = 0;
             int parameter1_value = 0;
             int parameter2_value = 0;
-            SignalFunction function1 = null;
-            SignalFunction function2 = null;
+            SignalFunction function1 = SignalFunction.NORMAL;
+            SignalFunction function2 = SignalFunction.NORMAL;
 
             // extract parameters (max. 2)
 

Original file line number	Diff line number	Diff line change
`@@ -2513,6 +2513,7 @@ public SCRParameterType(SCRTermType TypeIn, int IntIn)`
`2513`	`2513`	`{`
`2514`	`2514`	`PartType = TypeIn;`
`2515`	`2515`	`PartParameter = IntIn;`
	`2516`	`+ if (Enum.IsDefined(typeof(MstsSignalFunction), IntIn)) SignalFunction = new SignalFunction((MstsSignalFunction)IntIn);`
`2516`	`2517`	`}`
`2517`	`2518`
`2518`	`2519`	`// <summary>`