Simulator: align again

gfgit · gfgit · commit 9847f8424d48 · 2025-10-05T14:39:31.000+02:00
diff --git a/shared/src/traintastic/simulator/simulator.cpp b/shared/src/traintastic/simulator/simulator.cpp
@@ -2663,13 +2663,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
`@@ -2663,13 +2663,10 @@ bool Simulator::checkNextSignal(Train *train)`
`2663`	`2663`	`return false; // Stop`
`2664`	`2664`	`}`
`2665`	`2665`	`}`
`2666`		`- else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < train->state.nextSignal->maxSpeed * SpeedKmHtoTick)`
	`2666`	`+ else if(train->state.mode == TrainState::Mode::Automatic && train->state.speed < 30 * SpeedKmHtoTick)`
`2667`	`2667`	`{`
`2668`		`- if(train->state.speed< 30 * SpeedKmHtoTick)`
`2669`		`- {`
`2670`		`- // Get near at 30 km/h to next signal`
`2671`		`- setTrainSpeed(train, 30 * SpeedKmHtoTick);`
`2672`		`- }`
	`2668`	`+ // Get near at 30 km/h to next signal`
	`2669`	`+ setTrainSpeed(train, 30 * SpeedKmHtoTick);`
`2673`	`2670`	`}`
`2674`	`2671`
`2675`	`2672`	`return true;`