18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 07:36:02 +01:00

Merge pull request #279 from MaSzyna-EU07/fix/multiple-unit-electric-diesel

No multiple-unit control between electric and diesel locomotives (eu07/maszyna#520)
This commit is contained in:
2026-11-09 12:53:30 +00:00
committed by GitHub
7 changed files with 222 additions and 5 deletions

View File

@@ -811,6 +811,12 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string&
return true;
}
if (token == "controlcoupling.enginecheck")
{
ParseOne(Parser, control_coupling_engine_check, 1);
return true;
}
return false;
}
@@ -1653,6 +1659,7 @@ global_settings::export_as_text( std::ostream &Output ) const {
export_as_text( Output, "scenario.time.current", ScenarioTimeCurrent );
export_as_text( Output, "scenario.weather.temperature", AirTemperature );
export_as_text( Output, "ai.trainman", AITrainman );
export_as_text( Output, "controlcoupling.enginecheck", control_coupling_engine_check );
export_as_text( Output, "scalespeculars", ScaleSpecularValues );
export_as_text( Output, "gfxrenderer", GfxRenderer );
export_as_text( Output, "shadows", RenderShadows );