Simulator: align after rebase

Author: gfgit

shared/src/traintastic/simulator/simulator.cpp

@@ -2599,7 +2599,7 @@ bool Simulator::checkNextSignal(Train *train)
   if(!train->state.nextSignal)
   {
     const float length = getSegmentLength(staticData.trackSegments[face.segmentIndex], m_stateData);
-    if(length >= 400)
+    if(length >= 100)
     {
       // Long segments do not find signal and also do not set dirty
       // Set dirty near to end to re-trigger signal scan

shared/src/traintastic/simulator/simulator.hpp

@@ -464,7 +464,7 @@ class Simulator : public std::enable_shared_from_this<Simulator>
   void updateTrainPositions();
   bool updateVehiclePosition(VehicleState::Face& face,
                              const float speed, bool isFirst_,
-                             Train &trainState_);
+                             Train &train_);
   void updateSensors();
 
   bool isStraight(const TrackSegment& segment);