Simulator: align again

gfgit · gfgit · commit 06dbe6b1ed37 · 2025-10-15T20:25:24.000+02:00
diff --git a/shared/src/traintastic/simulator/simulator.cpp b/shared/src/traintastic/simulator/simulator.cpp
@@ -2642,13 +2642,10 @@ bool Simulator::checkNextSignal(Train *train)
         return false; // Stop
     }
   }
-  else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < train->state.nextSignal->maxSpeed * SpeedKmHtoTick)
+  else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < 30 * SpeedKmHtoTick)
   {
-    if(train->state.speed< 30 * SpeedKmHtoTick)
-    {
-      // Get near at 30 km/h to next signal
-      setTrainSpeed(train, 30 * SpeedKmHtoTick);
-    }
+    // Get near at 30 km/h to next signal
+    setTrainSpeed(train, 30 * SpeedKmHtoTick);
   }
 
   return true;

Original file line number	Diff line number	Diff line change
`@@ -2642,13 +2642,10 @@ bool Simulator::checkNextSignal(Train *train)`
`2642`	`2642`	`return false; // Stop`
`2643`	`2643`	`}`
`2644`	`2644`	`}`
`2645`		`- else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < train->state.nextSignal->maxSpeed * SpeedKmHtoTick)`
	`2645`	`+ else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < 30 * SpeedKmHtoTick)`
`2646`	`2646`	`{`
`2647`		`- if(train->state.speed< 30 * SpeedKmHtoTick)`
`2648`		`- {`
`2649`		`- // Get near at 30 km/h to next signal`
`2650`		`- setTrainSpeed(train, 30 * SpeedKmHtoTick);`
`2651`		`- }`
	`2647`	`+ // Get near at 30 km/h to next signal`
	`2648`	`+ setTrainSpeed(train, 30 * SpeedKmHtoTick);`
`2652`	`2649`	`}`
`2653`	`2650`
`2654`	`2651`	`return true;`