Correct bug in Joint distance loop

Author: peternewell

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

@@ -2009,13 +2009,27 @@ public virtual void Update(float elapsedClockSeconds, bool auxiliaryUpdate = tru
             // Initialise track joint trigger points. Sets the trigger point for the track joint reletative to other cars.
             // This is then reset every time a track joint is triggered, and positioned the same distance apart, hence reletative positions are maintained.
             // Only runs once at start up.
-            if (TrackJointSoundSetupInitialise)
+            if (TrackJointSoundSetupInitialise && (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM > 0)
             {
                 var trackjointdistanceM = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM;
                 var trainLengthM = 0.0f;
                 var cummulativeTrackJointDistanceM = 0.0f;
                 var remainDistanceM = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM;
 
+                // Set values for printing
+                bool concretesleepers = false;
+                
+                if ((float)Simulator.TRK.Tr_RouteFile.ConcreteSleepers == 1)
+                {
+                    concretesleepers = true;
+                }
+
+                if (Simulator.Settings.VerboseConfigurationMessages && Simulator.TRK.Tr_RouteFile.TrackSoundDefaultContinuousPlay)
+                {
+                    Trace.TraceInformation("======================================================================================================================");
+                    Trace.TraceInformation("TType Track Sounds Initialisation - Concrete Sleepers = {0}, Track Joint Distance = {1} m", concretesleepers, (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM);
+                }
+
 
                 foreach (var car in Cars)
                 {
@@ -2031,14 +2045,14 @@ public virtual void Update(float elapsedClockSeconds, bool auxiliaryUpdate = tru
                         remainDistanceM -= car.CarLengthM;
 
 
-          //              Trace.TraceInformation("Initialise Track Joints> - CarID {0} RealDistance {1} TrainLength {2} TRackJointDistance {3} CarLength {4} CumDistance {5} RemDistance {6}", car.CarID, car.realTimeTrackJointDistanceM, trainLengthM, trackjointdistanceM, car.CarLengthM, cummulativeTrackJointDistanceM, remainDistanceM);
+                        //              Trace.TraceInformation("Initialise Track Joints> - CarID {0} RealDistance {1} TrainLength {2} TRackJointDistance {3} CarLength {4} CumDistance {5} RemDistance {6}", car.CarID, car.realTimeTrackJointDistanceM, trainLengthM, trackjointdistanceM, car.CarLengthM, cummulativeTrackJointDistanceM, remainDistanceM);
 
                         // the next track joint has been reached reset all parameters in preparation for the next pass
                         if (remainDistanceM < 0.0f)
                         {
                             cummulativeTrackJointDistanceM = Math.Abs(remainDistanceM);
                             remainDistanceM = trackjointdistanceM - cummulativeTrackJointDistanceM;
-           //                 Trace.TraceInformation("Reset> - Cum {0} Rem {1}", cummulativeTrackJointDistanceM, remainDistanceM);
+                            //                 Trace.TraceInformation("Reset> - Cum {0} Rem {1}", cummulativeTrackJointDistanceM, remainDistanceM);
                         }
 
                     }
@@ -2051,26 +2065,33 @@ public virtual void Update(float elapsedClockSeconds, bool auxiliaryUpdate = tru
                         cummulativeTrackJointDistanceM += trackjointdistanceM;
                         remainDistanceM -= car.CarLengthM;
 
-      //                  Trace.TraceInformation("Initialise Track Joints< - CarID {0} RealDistance {1} TrainLength {2} TRackJointDistance {3} CarLength {4} CumDistance {5} RemDistance {6}", car.CarID, car.realTimeTrackJointDistanceM, trainLengthM, trackjointdistanceM, car.CarLengthM, cummulativeTrackJointDistanceM, remainDistanceM);
+                        //                  Trace.TraceInformation("Initialise Track Joints< - CarID {0} RealDistance {1} TrainLength {2} TRackJointDistance {3} CarLength {4} CumDistance {5} RemDistance {6}", car.CarID, car.realTimeTrackJointDistanceM, trainLengthM, trackjointdistanceM, car.CarLengthM, cummulativeTrackJointDistanceM, remainDistanceM);
 
                         if (remainDistanceM < 0.0f)
                         {
 
                             while (Math.Abs(remainDistanceM) > trackjointdistanceM)
                             {
                                 remainDistanceM += trackjointdistanceM;
-      //                          Trace.TraceInformation("Reset Remain< - CarID {0}, remainDistanceM {1}", car.CarID, remainDistanceM);
+                                //                          Trace.TraceInformation("Reset Remain< - CarID {0}, remainDistanceM {1}", car.CarID, remainDistanceM);
                             }
 
                             cummulativeTrackJointDistanceM = Math.Abs(remainDistanceM);
                             remainDistanceM = trackjointdistanceM - cummulativeTrackJointDistanceM;
-      //                      Trace.TraceInformation("Reset< - Cum {0} Rem {1}", cummulativeTrackJointDistanceM, remainDistanceM);
+                            //                      Trace.TraceInformation("Reset< - Cum {0} Rem {1}", cummulativeTrackJointDistanceM, remainDistanceM);
                         }
 
                     }
 
+                    if (Simulator.Settings.VerboseConfigurationMessages && Simulator.TRK.Tr_RouteFile.TrackSoundDefaultContinuousPlay)
+                    {
+                        Trace.TraceInformation("CarID {0}, Dist from Joint = {1} m, Car Length = {2} m, Train Length = {3} m, Axle Count = {4}", car.CarID, car.realTimeTrackJointDistanceM, car.CarLengthM, trainLengthM, car.SoundAxleCount);
+                    }
+
                 }
 
+                Trace.TraceInformation("======================================================================================================================");
+
                 TrackJointSoundSetupInitialise = false;
             }