Tweak check for early departure to prevent false positives during deceleration

Author: SteelFill

Source/Orts.Simulation/Simulation/Activity.cs

@@ -884,6 +884,8 @@ public override void NotifyEvent(ActivityEventType EventType)
                         double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
                                                 - ActArrive).Value.TotalSeconds;
                         BoardingEndS -= sinceActArriveS;
+
+                        ldbfevaldepartbeforeboarding = false; // reset flag. Debrief Eval
                     }
                     else
                     {
@@ -900,29 +902,30 @@ public override void NotifyEvent(ActivityEventType EventType)
                         if (BoardingS > 0 || ((double)(SchDepart - SchArrive).TotalSeconds > 0 &&
                             MyPlayerTrain.PassengerCarsNumber == 1 && MyPlayerTrain.Cars.Count > 10 ))
                         {
-                        // accepted station stop because either freight train or passenger train or fake passenger train with passenger car on platform or fake passenger train
+                            // accepted station stop because either freight train or passenger train or fake passenger train with passenger car on platform or fake passenger train
                             // with Scheduled Depart > Scheduled Arrive
-                                // ActArrive is usually same as ClockTime
-                                BoardingEndS = Simulator.ClockTime + BoardingS;
+                            // ActArrive is usually same as ClockTime
+                            BoardingEndS = Simulator.ClockTime + BoardingS;
 
-                                if (ActArrive == null)
-                                {
-                                    ActArrive = new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime));
-                                }
+                            if (ActArrive == null)
+                            {
+                                ActArrive = new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime));
+                            }
 
-                                arrived = true;
-                                // But not if game starts after scheduled arrival. In which case actual arrival is assumed to be same as schedule arrival.
-                                double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
-                                                        - ActArrive).Value.TotalSeconds;
-                                BoardingEndS -= sinceActArriveS;
-                                double SchDepartS = SchDepart.Subtract(new DateTime()).TotalSeconds;
-                                BoardingEndS = CompareTimes.LatestTime((int)SchDepartS, (int)BoardingEndS);
+                            arrived = true;
+                            // But not if game starts after scheduled arrival. In which case actual arrival is assumed to be same as schedule arrival.
+                            double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
+                                                    - ActArrive).Value.TotalSeconds;
+                            BoardingEndS -= sinceActArriveS;
+                            double SchDepartS = SchDepart.Subtract(new DateTime()).TotalSeconds;
+                            BoardingEndS = CompareTimes.LatestTime((int)SchDepartS, (int)BoardingEndS);
 
-                            }
                         }
+
+                        ldbfevaldepartbeforeboarding = false; // reset flag. Debrief Eval
+                    }
                     if  (MyPlayerTrain.NextSignalObject[0] != null)
                            distanceToNextSignal =  MyPlayerTrain.NextSignalObject[0].DistanceTo(MyPlayerTrain.FrontTDBTraveller);
-
                 }
             }
             else if (EventType == ActivityEventType.TrainStart)
@@ -937,6 +940,15 @@ public override void NotifyEvent(ActivityEventType EventType)
                     if (MyPlayerTrain.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
                        MyPlayerTrain.ClearStation(PlatformEnd1.LinkedPlatformItemId, PlatformEnd2.LinkedPlatformItemId, true);
 
+                    // Debrief Eval: departure before boarding completed
+                    if (!maydepart && !ldbfevaldepartbeforeboarding)
+                    {
+                        var train = Simulator.PlayerLocomotive.Train;
+                        ldbfevaldepartbeforeboarding = true;
+                        DbfEvalDepartBeforeBoarding.Add(PlatformEnd1.Station);
+                        train.DbfEvalValueChanged = true;
+                    }
+
                     if (LogStationStops)
                     {
                         StringBuilder stringBuild = new StringBuilder();
@@ -981,15 +993,6 @@ public override void NotifyEvent(ActivityEventType EventType)
                     {
                         DisplayMessage = Simulator.Catalog.GetStringFmt("Passenger boarding completes in {0:D2}:{1:D2}",
                             remaining / 60, remaining % 60);
-
-                        //Debrief Eval
-                        if (Simulator.PlayerLocomotive.SpeedMpS > 0 && !ldbfevaldepartbeforeboarding)
-                        {
-                            var train = Simulator.PlayerLocomotive.Train;
-                            ldbfevaldepartbeforeboarding = true;
-                            DbfEvalDepartBeforeBoarding.Add(PlatformEnd1.Station);
-                            train.DbfEvalValueChanged = true;
-                        }
                     }
                     // May depart
                     else if (!maydepart)
@@ -1008,8 +1011,6 @@ public override void NotifyEvent(ActivityEventType EventType)
                             if (MyPlayerTrain.IsActualPlayerTrain) Simulator.SoundNotify = Event.PermissionToDepart;
                         }
 
-                        ldbfevaldepartbeforeboarding = false;//reset flag. Debrief Eval
-
                         // if last task, show closure window
                         // also set times in logfile