mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-18 21:06:00 +01:00
refactor(simulation): tidy the test mode code
The test manager is reached through simulation::test() instead of a global, the result cell is owned by a unique_ptr until the memory table takes it, the cell value is compared with a margin, strings are built with std::format and the --test settings moved to apply_test_mode_settings(). The driver's signal check is folded into UpdateSpeedPosition(), which updates a speed table entry and reports a signal at stop the head of the train just passed. The test.* keys are listed with the other settings at the start of the log.
This commit is contained in:
@@ -60,7 +60,7 @@ bool scenarioloader_mode::update() {
|
||||
ErrorLog(std::format("Bad init: scenario \"{}\" couldn't be opened ({})", Global.SceneryFile, e.what()));
|
||||
state.reset();
|
||||
if (Global.test.enabled) {
|
||||
simulation::Test.finish(simulation::test_result::error, "scenario couldn't be opened");
|
||||
simulation::test().finish(simulation::test_result::error, "scenario couldn't be opened");
|
||||
return true;
|
||||
}
|
||||
Global.SceneryFile.clear();
|
||||
@@ -80,7 +80,7 @@ bool scenarioloader_mode::update() {
|
||||
state.reset();
|
||||
if( Global.test.enabled ) {
|
||||
// there's nothing to test; the exit code says the run went wrong
|
||||
simulation::Test.finish( simulation::test_result::error, "scenario loading failed" );
|
||||
simulation::test().finish( simulation::test_result::error, "scenario loading failed" );
|
||||
return true;
|
||||
}
|
||||
Global.SceneryFile.clear();
|
||||
|
||||
Reference in New Issue
Block a user