Merge pull request #561 from cesarBLG/manual-callon-advanced

Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907

Author: cjakeman

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

@@ -218,7 +218,6 @@ public enum TRAINTYPE
         public int IndexNextSignal = -1;                 // Index in SignalObjectItems for next signal
         public int IndexNextSpeedlimit = -1;             // Index in SignalObjectItems for next speedpost
         public SignalObject[] NextSignalObject = new SignalObject[2];  // direct reference to next signal
-        public SignalObject AllowedCallOnSignal;         // Signal for which train has call on allowed by dispatcher
 
         // Local max speed independently from signal and speedpost speed;
         // depends from various parameters like route max speed, overall or section efficiency of service,
@@ -2878,8 +2877,6 @@ public void UpdateManual(float elapsedClockSeconds)
                 // system will take back control of the signal
                 if (signalObject.holdState == SignalObject.HoldState.ManualPass ||
                     signalObject.holdState == SignalObject.HoldState.ManualApproach) signalObject.holdState = SignalObject.HoldState.None;
-
-                AllowedCallOnSignal = null;
             }
             UpdateSectionStateManual();                                                           // update track occupation          //
             UpdateManualMode(SignalObjIndex);                                                     // update route clearance           //
@@ -2907,8 +2904,6 @@ public void UpdateExplorer(float elapsedClockSeconds)
                 // system will take back control of the signal
                 if (signalObject.holdState == SignalObject.HoldState.ManualPass ||
                     signalObject.holdState == SignalObject.HoldState.ManualApproach) signalObject.holdState = SignalObject.HoldState.None;
-
-                AllowedCallOnSignal = null;
             }
             UpdateSectionStateExplorer();                                                         // update track occupation          //
             UpdateExplorerMode(SignalObjIndex);                                                   // update route clearance           //
@@ -7441,8 +7436,6 @@ public void UpdateRouteClearanceAhead(int signalObjectIndex, int backward, float
                     signalObject.holdState = SignalObject.HoldState.None;
                 }
 
-                AllowedCallOnSignal = null;
-
                 signalObject.resetSignalEnabled();
             }
         }
@@ -7594,9 +7587,6 @@ public bool CheckStoppedTrains(TCSubpathRoute thisRoute)
 
         public virtual bool TestCallOn(SignalObject thisSignal, bool allowOnNonePlatform, TCSubpathRoute thisRoute, string dumpfile)
         {
-            if (AllowedCallOnSignal == thisSignal)
-                return true;
-
             bool intoPlatform = false;
 
             foreach (Train.TCRouteElement routeElement in thisSignal.signalRoute)
@@ -7941,8 +7931,6 @@ public void UpdateManualMode(int signalObjectIndex)
                 if (thisSignal.holdState == SignalObject.HoldState.ManualPass ||
                     thisSignal.holdState == SignalObject.HoldState.ManualApproach) thisSignal.holdState = SignalObject.HoldState.None;
 
-                AllowedCallOnSignal = null;
-
                 thisSignal.resetSignalEnabled();
             }
 

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

@@ -8417,6 +8417,7 @@ public enum HoldState                // signal is locked in hold
         private InternalBlockstate internalBlockState = InternalBlockstate.Open;    // internal blockstate
         public Permission hasPermission = Permission.Denied;  // Permission to pass red signal
         public HoldState holdState = HoldState.None;
+        public bool CallOnManuallyAllowed;
 
         public List<int> sigfound = new List<int>();  // active next signal - used for signals with NORMAL heads only
         public int reqNormalSignal = -1;              // ref of normal signal requesting route clearing (only used for signals without NORMAL heads)
@@ -10110,8 +10111,8 @@ public void Update()
         public void resetSignalEnabled()
         {
             // reset train information
-
             enabledTrain = null;
+            CallOnManuallyAllowed = false;
             trainRouteDirectionIndex = 0;
             signalRoute.Clear();
             fullRoute = hasFixedRoute;
@@ -12196,7 +12197,7 @@ public bool TrainHasCallOn(bool allowOnNonePlatform, bool allowAdvancedSignal, s
 
             if (enabledTrain.Train != null && signalRoute != null)
             {
-                bool callOnValid = enabledTrain.Train.TestCallOn(this, allowOnNonePlatform, signalRoute, dumpfile);
+                bool callOnValid = CallOnManuallyAllowed || enabledTrain.Train.TestCallOn(this, allowOnNonePlatform, signalRoute, dumpfile);
                 return (callOnValid);
             }
 
@@ -12720,12 +12721,12 @@ public void SetManualCallOn(bool state)
             {
                 if (state && CallOnEnabled)
                 {
-                    enabledTrain.Train.AllowedCallOnSignal = this;
                     clearHoldSignalDispatcher();
+                    CallOnManuallyAllowed = true;
                 }
-                else if (enabledTrain.Train.AllowedCallOnSignal == this)
+                else
                 {
-                    enabledTrain.Train.AllowedCallOnSignal = null;
+                    CallOnManuallyAllowed = false;
                 }
             }
         }

Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs

@@ -1547,13 +1547,8 @@ private void HandlePickedSignal()
 			  boxSetSignal.Items.RemoveAt(4);
 
 		  if (signalPickedItem.Signal.enabledTrain != null && signalPickedItem.Signal.CallOnEnabled)
-		  {
-			  if (signalPickedItem.Signal.enabledTrain.Train.AllowedCallOnSignal != signalPickedItem.Signal)
-			  boxSetSignal.Items.Add("Enable call on");
-			  /*else
-				  boxSetSignal.Items.Add("Disable call on");*/
-			  // To disable Call On signal must be manually set to stop, to avoid signal state change
-			  // in the interval between this list is shown and the option is selected by dispatcher
+          {
+                if (!signalPickedItem.Signal.CallOnManuallyAllowed) boxSetSignal.Items.Add("Allow call on");
 		  }
 
 		  boxSetSignal.Location = new System.Drawing.Point(LastCursorPosition.X + 2, y);