eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 07:29:19 +02:00
Code Issues 123 Wiki Activity

Resolve conflicts for merge

Browse Source
This commit is contained in:
Hirek
2025-09-04 20:27:45 +02:00
parent 311a827ade 6b21737ec4
commit 072165aae3
7 changed files with 631 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Globals.cpp
View File

@@ -673,6 +673,12 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> token; Parser >> token;
iPause |= (token == "yes" ? 1 : 0); iPause |= (token == "yes" ? 1 : 0);
} }
else if (token == "priorityloadtext3d")
{
Parser.getTokens(1);
Parser >> token;
priorityLoadText3D = (token == "yes" ? true : false);
}
else if (token == "lang") else if (token == "lang")
{ {
// domyślny język - http://tools.ietf.org/html/bcp47 // domyślny język - http://tools.ietf.org/html/bcp47
@@ -1371,6 +1377,7 @@ global_settings::export_as_text( std::ostream &Output ) const {
export_as_text( Output, "joinduplicatedevents", bJoinEvents ); export_as_text( Output, "joinduplicatedevents", bJoinEvents );
export_as_text( Output, "hiddenevents", iHiddenEvents ); export_as_text( Output, "hiddenevents", iHiddenEvents );
export_as_text( Output, "pause", ( iPause & 1 ) != 0 ); export_as_text( Output, "pause", ( iPause & 1 ) != 0 );
export_as_text(Output, "priorityLoadText3D", priorityLoadText3D);
export_as_text( Output, "lang", asLang ); export_as_text( Output, "lang", asLang );
export_as_text( Output, "python.updatetime", PythonScreenUpdateRate ); export_as_text( Output, "python.updatetime", PythonScreenUpdateRate );
Output Output

1
Globals.h
View File

@@ -83,6 +83,7 @@ struct global_settings {
bool file_binary_terrain{ true }; // enable binary terrain (de)serialization bool file_binary_terrain{ true }; // enable binary terrain (de)serialization
bool file_binary_terrain_state{true}; bool file_binary_terrain_state{true};
// logs // logs
bool priorityLoadText3D{false}; // ladowanie T3D priorytetowo
int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów
bool MultipleLogs{ false }; bool MultipleLogs{ false };
unsigned int DisabledLogTypes{ 0 }; unsigned int DisabledLogTypes{ 0 };

1
McZapkie/Mover.cpp
View File

@@ -11358,7 +11358,6 @@ void TMoverParameters::LoadFIZ_FFList( std::string const &Input ) {
extract_value( RlistSize, "Size", Input, "" ); extract_value( RlistSize, "Size", Input, "" );
} }
void TMoverParameters::LoadFIZ_WiperList(std::string const &Input) void TMoverParameters::LoadFIZ_WiperList(std::string const &Input)
{ {
extract_value(WiperListSize, "Size", Input, ""); extract_value(WiperListSize, "Size", Input, "");

27
Model3d.cpp
View File

@@ -1567,23 +1567,28 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic)
m_filename = name; m_filename = name;
asBinary = name + ".e3d"; asBinary = name + ".e3d";
if (FileExists(asBinary))
// Hirek: Jesli mamy ustawione priorityLoadText3D na yes to wpierw ladujemy t3d
if (Global.priorityLoadText3D && FileExists(name + ".t3d"))
{ {
LoadFromBinFile(asBinary, dynamic); WriteLog("Forced loading text model \"" + name + ".t3d\"");
asBinary = ""; // wyłączenie zapisu LoadFromTextFile(name + ".t3d", dynamic);
if (!dynamic)
Init(); Init();
} }
else else if (FileExists(asBinary))
{ {
if (FileExists(name + ".t3d")) LoadFromBinFile(asBinary, dynamic);
asBinary = "";
Init();
}
else if (FileExists(name + ".t3d"))
{ {
LoadFromTextFile(name + ".t3d", dynamic); // wczytanie tekstowego LoadFromTextFile(name + ".t3d", dynamic);
if( !dynamic ) { if (!dynamic)
// pojazdy dopiero po ustawieniu animacji Init();
Init(); // generowanie siatek i zapis E3D
}
}
} }
bool const result = bool const result =
Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem
if (false == result) if (false == result)

443
command.cpp
View File

@@ -155,232 +155,233 @@ commanddescription_sequence Commands_descriptions = {
{"cabchangebackward", command_target::vehicle, command_mode::oneoff}, {"cabchangebackward", command_target::vehicle, command_mode::oneoff},
{"modernlightdimmerdecrease", command_target::vehicle, command_mode::oneoff}, {"modernlightdimmerdecrease", command_target::vehicle, command_mode::oneoff},
{"modernlightdimmerincrease", command_target::vehicle, command_mode::oneoff}, {"modernlightdimmerincrease", command_target::vehicle, command_mode::oneoff},
{"viewturn", command_target::entity, command_mode::oneoff}, { "viewturn", command_target::entity, command_mode::oneoff },
{"movehorizontal", command_target::entity, command_mode::oneoff}, { "movehorizontal", command_target::entity, command_mode::oneoff },
{"movehorizontalfast", command_target::entity, command_mode::oneoff}, { "movehorizontalfast", command_target::entity, command_mode::oneoff },
{"movevertical", command_target::entity, command_mode::oneoff}, { "movevertical", command_target::entity, command_mode::oneoff },
{"moveverticalfast", command_target::entity, command_mode::oneoff}, { "moveverticalfast", command_target::entity, command_mode::oneoff },
{"moveleft", command_target::entity, command_mode::oneoff}, { "moveleft", command_target::entity, command_mode::oneoff },
{"moveright", command_target::entity, command_mode::oneoff}, { "moveright", command_target::entity, command_mode::oneoff },
{"moveforward", command_target::entity, command_mode::oneoff}, { "moveforward", command_target::entity, command_mode::oneoff },
{"moveback", command_target::entity, command_mode::oneoff}, { "moveback", command_target::entity, command_mode::oneoff },
{"moveup", command_target::entity, command_mode::oneoff}, { "moveup", command_target::entity, command_mode::oneoff },
{"movedown", command_target::entity, command_mode::oneoff}, { "movedown", command_target::entity, command_mode::oneoff },
{"nearestcarcouplingincrease", command_target::vehicle, command_mode::oneoff}, { "nearestcarcouplingincrease", command_target::vehicle, command_mode::oneoff },
{"nearestcarcouplingdisconnect", command_target::vehicle, command_mode::oneoff}, { "nearestcarcouplingdisconnect", command_target::vehicle, command_mode::oneoff },
{"nearestcarcoupleradapterattach", command_target::vehicle, command_mode::oneoff}, { "nearestcarcoupleradapterattach", command_target::vehicle, command_mode::oneoff },
{"nearestcarcoupleradapterremove", command_target::vehicle, command_mode::oneoff}, { "nearestcarcoupleradapterremove", command_target::vehicle, command_mode::oneoff },
{"occupiedcarcouplingdisconnect", command_target::vehicle, command_mode::oneoff}, { "occupiedcarcouplingdisconnect", command_target::vehicle, command_mode::oneoff },
{"occupiedcarcouplingdisconnectback", command_target::vehicle, command_mode::oneoff}, { "occupiedcarcouplingdisconnectback", command_target::vehicle, command_mode::oneoff },
{"doortoggleleft", command_target::vehicle, command_mode::oneoff}, { "doortoggleleft", command_target::vehicle, command_mode::oneoff },
{"doortoggleright", command_target::vehicle, command_mode::oneoff}, { "doortoggleright", command_target::vehicle, command_mode::oneoff },
{"doorpermitleft", command_target::vehicle, command_mode::oneoff}, { "doorpermitleft", command_target::vehicle, command_mode::oneoff },
{"doorpermitright", command_target::vehicle, command_mode::oneoff}, { "doorpermitright", command_target::vehicle, command_mode::oneoff },
{"doorpermitpresetactivatenext", command_target::vehicle, command_mode::oneoff}, { "doorpermitpresetactivatenext", command_target::vehicle, command_mode::oneoff },
{"doorpermitpresetactivateprevious", command_target::vehicle, command_mode::oneoff}, { "doorpermitpresetactivateprevious", command_target::vehicle, command_mode::oneoff },
{"dooropenleft", command_target::vehicle, command_mode::oneoff}, { "dooropenleft", command_target::vehicle, command_mode::oneoff },
{"dooropenright", command_target::vehicle, command_mode::oneoff}, { "dooropenright", command_target::vehicle, command_mode::oneoff },
{"dooropenall", command_target::vehicle, command_mode::oneoff}, { "dooropenall", command_target::vehicle, command_mode::oneoff },
{"doorcloseleft", command_target::vehicle, command_mode::oneoff}, { "doorcloseleft", command_target::vehicle, command_mode::oneoff },
{"doorcloseright", command_target::vehicle, command_mode::oneoff}, { "doorcloseright", command_target::vehicle, command_mode::oneoff },
{"doorcloseall", command_target::vehicle, command_mode::oneoff}, { "doorcloseall", command_target::vehicle, command_mode::oneoff },
{"doorsteptoggle", command_target::vehicle, command_mode::oneoff}, { "doorsteptoggle", command_target::vehicle, command_mode::oneoff },
{"doormodetoggle", command_target::vehicle, command_mode::oneoff}, { "doormodetoggle", command_target::vehicle, command_mode::oneoff },
{"mirrorstoggle", command_target::vehicle, command_mode::oneoff}, { "mirrorstoggle", command_target::vehicle, command_mode::oneoff },
{"departureannounce", command_target::vehicle, command_mode::oneoff}, { "departureannounce", command_target::vehicle, command_mode::oneoff },
{"doorlocktoggle", command_target::vehicle, command_mode::oneoff}, { "doorlocktoggle", command_target::vehicle, command_mode::oneoff },
{"pantographcompressorvalvetoggle", command_target::vehicle, command_mode::oneoff}, { "pantographcompressorvalvetoggle", command_target::vehicle, command_mode::oneoff },
{"pantographcompressorvalveenable", command_target::vehicle, command_mode::oneoff}, { "pantographcompressorvalveenable", command_target::vehicle, command_mode::oneoff },
{"pantographcompressorvalvedisable", command_target::vehicle, command_mode::oneoff}, { "pantographcompressorvalvedisable", command_target::vehicle, command_mode::oneoff },
{"pantographcompressoractivate", command_target::vehicle, command_mode::oneoff}, { "pantographcompressoractivate", command_target::vehicle, command_mode::oneoff },
{"pantographtogglefront", command_target::vehicle, command_mode::oneoff}, { "pantographtogglefront", command_target::vehicle, command_mode::oneoff },
{"pantographtogglerear", command_target::vehicle, command_mode::oneoff}, { "pantographtogglerear", command_target::vehicle, command_mode::oneoff },
{"pantographraisefront", command_target::vehicle, command_mode::oneoff}, { "pantographraisefront", command_target::vehicle, command_mode::oneoff },
{"pantographraiserear", command_target::vehicle, command_mode::oneoff}, { "pantographraiserear", command_target::vehicle, command_mode::oneoff },
{"pantographlowerfront", command_target::vehicle, command_mode::oneoff}, { "pantographlowerfront", command_target::vehicle, command_mode::oneoff },
{"pantographlowerrear", command_target::vehicle, command_mode::oneoff}, { "pantographlowerrear", command_target::vehicle, command_mode::oneoff },
{"pantographlowerall", command_target::vehicle, command_mode::oneoff}, { "pantographlowerall", command_target::vehicle, command_mode::oneoff },
{"pantographselectnext", command_target::vehicle, command_mode::oneoff}, { "pantographselectnext", command_target::vehicle, command_mode::oneoff },
{"pantographselectprevious", command_target::vehicle, command_mode::oneoff}, { "pantographselectprevious", command_target::vehicle, command_mode::oneoff },
{"pantographtoggleselected", command_target::vehicle, command_mode::oneoff}, { "pantographtoggleselected", command_target::vehicle, command_mode::oneoff },
{"pantographraiseselected", command_target::vehicle, command_mode::oneoff}, { "pantographraiseselected", command_target::vehicle, command_mode::oneoff },
{"pantographlowerselected", command_target::vehicle, command_mode::oneoff}, { "pantographlowerselected", command_target::vehicle, command_mode::oneoff },
{"pantographvalvesupdate", command_target::vehicle, command_mode::oneoff}, { "pantographvalvesupdate", command_target::vehicle, command_mode::oneoff },
{"pantographvalvesoff", command_target::vehicle, command_mode::oneoff}, { "pantographvalvesoff", command_target::vehicle, command_mode::oneoff },
{"heatingtoggle", command_target::vehicle, command_mode::oneoff}, { "heatingtoggle", command_target::vehicle, command_mode::oneoff },
{"heatingenable", command_target::vehicle, command_mode::oneoff}, { "heatingenable", command_target::vehicle, command_mode::oneoff },
{"heatingdisable", command_target::vehicle, command_mode::oneoff}, { "heatingdisable", command_target::vehicle, command_mode::oneoff },
{"lightspresetactivatenext", command_target::vehicle, command_mode::oneoff}, { "lightspresetactivatenext", command_target::vehicle, command_mode::oneoff },
{"lightspresetactivateprevious", command_target::vehicle, command_mode::oneoff}, { "lightspresetactivateprevious", command_target::vehicle, command_mode::oneoff },
{"headlighttoggleleft", command_target::vehicle, command_mode::oneoff}, { "headlighttoggleleft", command_target::vehicle, command_mode::oneoff },
{"headlightenableleft", command_target::vehicle, command_mode::oneoff}, { "headlightenableleft", command_target::vehicle, command_mode::oneoff },
{"headlightdisableleft", command_target::vehicle, command_mode::oneoff}, { "headlightdisableleft", command_target::vehicle, command_mode::oneoff },
{"headlighttoggleright", command_target::vehicle, command_mode::oneoff}, { "headlighttoggleright", command_target::vehicle, command_mode::oneoff },
{"headlightenableright", command_target::vehicle, command_mode::oneoff}, { "headlightenableright", command_target::vehicle, command_mode::oneoff },
{"headlightdisableright", command_target::vehicle, command_mode::oneoff}, { "headlightdisableright", command_target::vehicle, command_mode::oneoff },
{"headlighttoggleupper", command_target::vehicle, command_mode::oneoff}, { "headlighttoggleupper", command_target::vehicle, command_mode::oneoff },
{"headlightenableupper", command_target::vehicle, command_mode::oneoff}, { "headlightenableupper", command_target::vehicle, command_mode::oneoff },
{"headlightdisableupper", command_target::vehicle, command_mode::oneoff}, { "headlightdisableupper", command_target::vehicle, command_mode::oneoff },
{"redmarkertoggleleft", command_target::vehicle, command_mode::oneoff}, { "redmarkertoggleleft", command_target::vehicle, command_mode::oneoff },
{"redmarkerenableleft", command_target::vehicle, command_mode::oneoff}, { "redmarkerenableleft", command_target::vehicle, command_mode::oneoff },
{"redmarkerdisableleft", command_target::vehicle, command_mode::oneoff}, { "redmarkerdisableleft", command_target::vehicle, command_mode::oneoff },
{"redmarkertoggleright", command_target::vehicle, command_mode::oneoff}, { "redmarkertoggleright", command_target::vehicle, command_mode::oneoff },
{"redmarkerenableright", command_target::vehicle, command_mode::oneoff}, { "redmarkerenableright", command_target::vehicle, command_mode::oneoff },
{"redmarkerdisableright", command_target::vehicle, command_mode::oneoff}, { "redmarkerdisableright", command_target::vehicle, command_mode::oneoff },
{"headlighttogglerearleft", command_target::vehicle, command_mode::oneoff}, { "headlighttogglerearleft", command_target::vehicle, command_mode::oneoff },
{"headlightenablerearleft", command_target::vehicle, command_mode::oneoff}, { "headlightenablerearleft", command_target::vehicle, command_mode::oneoff },
{"headlightdisablerearleft", command_target::vehicle, command_mode::oneoff}, { "headlightdisablerearleft", command_target::vehicle, command_mode::oneoff },
{"headlighttogglerearright", command_target::vehicle, command_mode::oneoff}, { "headlighttogglerearright", command_target::vehicle, command_mode::oneoff },
{"headlightenablerearright", command_target::vehicle, command_mode::oneoff}, { "headlightenablerearright", command_target::vehicle, command_mode::oneoff },
{"headlightdisablerearright", command_target::vehicle, command_mode::oneoff}, { "headlightdisablerearright", command_target::vehicle, command_mode::oneoff },
{"headlighttogglerearupper", command_target::vehicle, command_mode::oneoff}, { "headlighttogglerearupper", command_target::vehicle, command_mode::oneoff },
{"headlightenablerearupper", command_target::vehicle, command_mode::oneoff}, { "headlightenablerearupper", command_target::vehicle, command_mode::oneoff },
{"headlightdisablerearupper", command_target::vehicle, command_mode::oneoff}, { "headlightdisablerearupper", command_target::vehicle, command_mode::oneoff },
{"redmarkertogglerearleft", command_target::vehicle, command_mode::oneoff}, { "redmarkertogglerearleft", command_target::vehicle, command_mode::oneoff },
{"redmarkerenablerearleft", command_target::vehicle, command_mode::oneoff}, { "redmarkerenablerearleft", command_target::vehicle, command_mode::oneoff },
{"redmarkerdisablerearleft", command_target::vehicle, command_mode::oneoff}, { "redmarkerdisablerearleft", command_target::vehicle, command_mode::oneoff },
{"redmarkertogglerearright", command_target::vehicle, command_mode::oneoff}, { "redmarkertogglerearright", command_target::vehicle, command_mode::oneoff },
{"redmarkerenablerearright", command_target::vehicle, command_mode::oneoff}, { "redmarkerenablerearright", command_target::vehicle, command_mode::oneoff },
{"redmarkerdisablerearright", command_target::vehicle, command_mode::oneoff}, { "redmarkerdisablerearright", command_target::vehicle, command_mode::oneoff },
{"redmarkerstoggle", command_target::vehicle, command_mode::oneoff}, { "redmarkerstoggle", command_target::vehicle, command_mode::oneoff },
{"endsignalstoggle", command_target::vehicle, command_mode::oneoff}, { "endsignalstoggle", command_target::vehicle, command_mode::oneoff },
{"headlightsdimtoggle", command_target::vehicle, command_mode::oneoff}, { "headlightsdimtoggle", command_target::vehicle, command_mode::oneoff },
{"headlightsdimenable", command_target::vehicle, command_mode::oneoff}, { "headlightsdimenable", command_target::vehicle, command_mode::oneoff },
{"headlightsdimdisable", command_target::vehicle, command_mode::oneoff}, { "headlightsdimdisable", command_target::vehicle, command_mode::oneoff },
{"motorconnectorsopen", command_target::vehicle, command_mode::oneoff}, { "motorconnectorsopen", command_target::vehicle, command_mode::oneoff },
{"motorconnectorsclose", command_target::vehicle, command_mode::oneoff}, { "motorconnectorsclose", command_target::vehicle, command_mode::oneoff },
{"motordisconnect", command_target::vehicle, command_mode::oneoff}, { "motordisconnect", command_target::vehicle, command_mode::oneoff },
{"interiorlighttoggle", command_target::vehicle, command_mode::oneoff}, { "interiorlighttoggle", command_target::vehicle, command_mode::oneoff },
{"interiorlightenable", command_target::vehicle, command_mode::oneoff}, { "interiorlightenable", command_target::vehicle, command_mode::oneoff },
{"interiorlightdisable", command_target::vehicle, command_mode::oneoff}, { "interiorlightdisable", command_target::vehicle, command_mode::oneoff },
{"interiorlightdimtoggle", command_target::vehicle, command_mode::oneoff}, { "interiorlightdimtoggle", command_target::vehicle, command_mode::oneoff },
{"interiorlightdimenable", command_target::vehicle, command_mode::oneoff}, { "interiorlightdimenable", command_target::vehicle, command_mode::oneoff },
{"interiorlightdimdisable", command_target::vehicle, command_mode::oneoff}, { "interiorlightdimdisable", command_target::vehicle, command_mode::oneoff },
{"compartmentlightstoggle", command_target::vehicle, command_mode::oneoff}, { "compartmentlightstoggle", command_target::vehicle, command_mode::oneoff },
{"compartmentlightsenable", command_target::vehicle, command_mode::oneoff}, { "compartmentlightsenable", command_target::vehicle, command_mode::oneoff },
{"compartmentlightsdisable", command_target::vehicle, command_mode::oneoff}, { "compartmentlightsdisable", command_target::vehicle, command_mode::oneoff },
{"instrumentlighttoggle", command_target::vehicle, command_mode::oneoff}, { "instrumentlighttoggle", command_target::vehicle, command_mode::oneoff },
{"instrumentlightenable", command_target::vehicle, command_mode::oneoff}, { "instrumentlightenable", command_target::vehicle, command_mode::oneoff },
{"instrumentlightdisable", command_target::vehicle, command_mode::oneoff}, { "instrumentlightdisable", command_target::vehicle, command_mode::oneoff },
{"dashboardlighttoggle", command_target::vehicle, command_mode::oneoff}, { "dashboardlighttoggle", command_target::vehicle, command_mode::oneoff },
{"dashboardlightenable", command_target::vehicle, command_mode::oneoff}, { "dashboardlightenable", command_target::vehicle, command_mode::oneoff },
{"dashboardlightdisable", command_target::vehicle, command_mode::oneoff}, { "dashboardlightdisable", command_target::vehicle, command_mode::oneoff },
{"timetablelighttoggle", command_target::vehicle, command_mode::oneoff}, { "timetablelighttoggle", command_target::vehicle, command_mode::oneoff },
{"timetablelightenable", command_target::vehicle, command_mode::oneoff}, { "timetablelightenable", command_target::vehicle, command_mode::oneoff },
{"timetablelightdisable", command_target::vehicle, command_mode::oneoff}, { "timetablelightdisable", command_target::vehicle, command_mode::oneoff },
{"generictoggle0", command_target::vehicle, command_mode::oneoff}, { "generictoggle0", command_target::vehicle, command_mode::oneoff },
{"generictoggle1", command_target::vehicle, command_mode::oneoff}, { "generictoggle1", command_target::vehicle, command_mode::oneoff },
{"generictoggle2", command_target::vehicle, command_mode::oneoff}, { "generictoggle2", command_target::vehicle, command_mode::oneoff },
{"generictoggle3", command_target::vehicle, command_mode::oneoff}, { "generictoggle3", command_target::vehicle, command_mode::oneoff },
{"generictoggle4", command_target::vehicle, command_mode::oneoff}, { "generictoggle4", command_target::vehicle, command_mode::oneoff },
{"generictoggle5", command_target::vehicle, command_mode::oneoff}, { "generictoggle5", command_target::vehicle, command_mode::oneoff },
{"generictoggle6", command_target::vehicle, command_mode::oneoff}, { "generictoggle6", command_target::vehicle, command_mode::oneoff },
{"generictoggle7", command_target::vehicle, command_mode::oneoff}, { "generictoggle7", command_target::vehicle, command_mode::oneoff },
{"generictoggle8", command_target::vehicle, command_mode::oneoff}, { "generictoggle8", command_target::vehicle, command_mode::oneoff },
{"generictoggle9", command_target::vehicle, command_mode::oneoff}, { "generictoggle9", command_target::vehicle, command_mode::oneoff },
{"batterytoggle", command_target::vehicle, command_mode::oneoff}, { "batterytoggle", command_target::vehicle, command_mode::oneoff },
{"batteryenable", command_target::vehicle, command_mode::oneoff}, { "batteryenable", command_target::vehicle, command_mode::oneoff },
{"batterydisable", command_target::vehicle, command_mode::oneoff}, { "batterydisable", command_target::vehicle, command_mode::oneoff },
{"cabactivationtoggle", command_target::vehicle, command_mode::oneoff}, { "cabactivationtoggle", command_target::vehicle, command_mode::oneoff },
{"cabactivationenable", command_target::vehicle, command_mode::oneoff}, { "cabactivationenable", command_target::vehicle, command_mode::oneoff },
{"cabactivationdisable", command_target::vehicle, command_mode::oneoff}, { "cabactivationdisable", command_target::vehicle, command_mode::oneoff },
{"motorblowerstogglefront", command_target::vehicle, command_mode::oneoff}, { "motorblowerstogglefront", command_target::vehicle, command_mode::oneoff },
{"motorblowerstogglerear", command_target::vehicle, command_mode::oneoff}, { "motorblowerstogglerear", command_target::vehicle, command_mode::oneoff },
{"motorblowersdisableall", command_target::vehicle, command_mode::oneoff}, { "motorblowersdisableall", command_target::vehicle, command_mode::oneoff },
{"coolingfanstoggle", command_target::vehicle, command_mode::oneoff}, { "coolingfanstoggle", command_target::vehicle, command_mode::oneoff },
{"tempomattoggle", command_target::vehicle, command_mode::oneoff}, { "tempomattoggle", command_target::vehicle, command_mode::oneoff },
{"springbraketoggle", command_target::vehicle, command_mode::oneoff}, { "springbraketoggle", command_target::vehicle, command_mode::oneoff },
{"springbrakeenable", command_target::vehicle, command_mode::oneoff}, { "springbrakeenable", command_target::vehicle, command_mode::oneoff },
{"springbrakedisable", command_target::vehicle, command_mode::oneoff}, { "springbrakedisable", command_target::vehicle, command_mode::oneoff },
{"springbrakeshutofftoggle", command_target::vehicle, command_mode::oneoff}, { "springbrakeshutofftoggle", command_target::vehicle, command_mode::oneoff },
{"springbrakeshutoffenable", command_target::vehicle, command_mode::oneoff}, { "springbrakeshutoffenable", command_target::vehicle, command_mode::oneoff },
{"springbrakeshutoffdisable", command_target::vehicle, command_mode::oneoff}, { "springbrakeshutoffdisable", command_target::vehicle, command_mode::oneoff },
{"springbrakerelease", command_target::vehicle}, { "springbrakerelease", command_target::vehicle },
{"distancecounteractivate", command_target::vehicle, command_mode::oneoff}, { "distancecounteractivate", command_target::vehicle, command_mode::oneoff },
{"speedcontrolincrease", command_target::vehicle, command_mode::oneoff}, { "speedcontrolincrease", command_target::vehicle, command_mode::oneoff },
{"speedcontroldecrease", command_target::vehicle, command_mode::oneoff}, { "speedcontroldecrease", command_target::vehicle, command_mode::oneoff },
{"speedcontrolpowerincrease", command_target::vehicle, command_mode::oneoff}, { "speedcontrolpowerincrease", command_target::vehicle, command_mode::oneoff },
{"speedcontrolpowerdecrease", command_target::vehicle, command_mode::oneoff}, { "speedcontrolpowerdecrease", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton0", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton0", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton1", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton1", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton2", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton2", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton3", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton3", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton4", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton4", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton5", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton5", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton6", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton6", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton7", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton7", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton8", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton8", command_target::vehicle, command_mode::oneoff },
{"speedcontrolbutton9", command_target::vehicle, command_mode::oneoff}, { "speedcontrolbutton9", command_target::vehicle, command_mode::oneoff },
{"inverterenable1", command_target::vehicle, command_mode::oneoff}, { "inverterenable1", command_target::vehicle, command_mode::oneoff },
{"inverterenable2", command_target::vehicle, command_mode::oneoff}, { "inverterenable2", command_target::vehicle, command_mode::oneoff },
{"inverterenable3", command_target::vehicle, command_mode::oneoff}, { "inverterenable3", command_target::vehicle, command_mode::oneoff },
{"inverterenable4", command_target::vehicle, command_mode::oneoff}, { "inverterenable4", command_target::vehicle, command_mode::oneoff },
{"inverterenable5", command_target::vehicle, command_mode::oneoff}, { "inverterenable5", command_target::vehicle, command_mode::oneoff },
{"inverterenable6", command_target::vehicle, command_mode::oneoff}, { "inverterenable6", command_target::vehicle, command_mode::oneoff },
{"inverterenable7", command_target::vehicle, command_mode::oneoff}, { "inverterenable7", command_target::vehicle, command_mode::oneoff },
{"inverterenable8", command_target::vehicle, command_mode::oneoff}, { "inverterenable8", command_target::vehicle, command_mode::oneoff },
{"inverterenable9", command_target::vehicle, command_mode::oneoff}, { "inverterenable9", command_target::vehicle, command_mode::oneoff },
{"inverterenable10", command_target::vehicle, command_mode::oneoff}, { "inverterenable10", command_target::vehicle, command_mode::oneoff },
{"inverterenable11", command_target::vehicle, command_mode::oneoff}, { "inverterenable11", command_target::vehicle, command_mode::oneoff },
{"inverterenable12", command_target::vehicle, command_mode::oneoff}, { "inverterenable12", command_target::vehicle, command_mode::oneoff },
{"inverterdisable1", command_target::vehicle, command_mode::oneoff}, { "inverterdisable1", command_target::vehicle, command_mode::oneoff },
{"inverterdisable2", command_target::vehicle, command_mode::oneoff}, { "inverterdisable2", command_target::vehicle, command_mode::oneoff },
{"inverterdisable3", command_target::vehicle, command_mode::oneoff}, { "inverterdisable3", command_target::vehicle, command_mode::oneoff },
{"inverterdisable4", command_target::vehicle, command_mode::oneoff}, { "inverterdisable4", command_target::vehicle, command_mode::oneoff },
{"inverterdisable5", command_target::vehicle, command_mode::oneoff}, { "inverterdisable5", command_target::vehicle, command_mode::oneoff },
{"inverterdisable6", command_target::vehicle, command_mode::oneoff}, { "inverterdisable6", command_target::vehicle, command_mode::oneoff },
{"inverterdisable7", command_target::vehicle, command_mode::oneoff}, { "inverterdisable7", command_target::vehicle, command_mode::oneoff },
{"inverterdisable8", command_target::vehicle, command_mode::oneoff}, { "inverterdisable8", command_target::vehicle, command_mode::oneoff },
{"inverterdisable9", command_target::vehicle, command_mode::oneoff}, { "inverterdisable9", command_target::vehicle, command_mode::oneoff },
{"inverterdisable10", command_target::vehicle, command_mode::oneoff}, { "inverterdisable10", command_target::vehicle, command_mode::oneoff },
{"inverterdisable11", command_target::vehicle, command_mode::oneoff}, { "inverterdisable11", command_target::vehicle, command_mode::oneoff },
{"inverterdisable12", command_target::vehicle, command_mode::oneoff}, { "inverterdisable12", command_target::vehicle, command_mode::oneoff },
{"invertertoggle1", command_target::vehicle, command_mode::oneoff}, { "invertertoggle1", command_target::vehicle, command_mode::oneoff },
{"invertertoggle2", command_target::vehicle, command_mode::oneoff}, { "invertertoggle2", command_target::vehicle, command_mode::oneoff },
{"invertertoggle3", command_target::vehicle, command_mode::oneoff}, { "invertertoggle3", command_target::vehicle, command_mode::oneoff },
{"invertertoggle4", command_target::vehicle, command_mode::oneoff}, { "invertertoggle4", command_target::vehicle, command_mode::oneoff },
{"invertertoggle5", command_target::vehicle, command_mode::oneoff}, { "invertertoggle5", command_target::vehicle, command_mode::oneoff },
{"invertertoggle6", command_target::vehicle, command_mode::oneoff}, { "invertertoggle6", command_target::vehicle, command_mode::oneoff },
{"invertertoggle7", command_target::vehicle, command_mode::oneoff}, { "invertertoggle7", command_target::vehicle, command_mode::oneoff },
{"invertertoggle8", command_target::vehicle, command_mode::oneoff}, { "invertertoggle8", command_target::vehicle, command_mode::oneoff },
{"invertertoggle9", command_target::vehicle, command_mode::oneoff}, { "invertertoggle9", command_target::vehicle, command_mode::oneoff },
{"invertertoggle10", command_target::vehicle, command_mode::oneoff}, { "invertertoggle10", command_target::vehicle, command_mode::oneoff },
{"invertertoggle11", command_target::vehicle, command_mode::oneoff}, { "invertertoggle11", command_target::vehicle, command_mode::oneoff },
{"invertertoggle12", command_target::vehicle, command_mode::oneoff}, { "invertertoggle12", command_target::vehicle, command_mode::oneoff },
{"globalradiostop", command_target::simulation, command_mode::oneoff}, { "globalradiostop", command_target::simulation, command_mode::oneoff },
{"timejump", command_target::simulation, command_mode::oneoff}, { "timejump", command_target::simulation, command_mode::oneoff },
{"timejumplarge", command_target::simulation, command_mode::oneoff}, { "timejumplarge", command_target::simulation, command_mode::oneoff },
{"timejumpsmall", command_target::simulation, command_mode::oneoff}, { "timejumpsmall", command_target::simulation, command_mode::oneoff },
{"setdatetime", command_target::simulation, command_mode::oneoff}, { "setdatetime", command_target::simulation, command_mode::oneoff },
{"setweather", command_target::simulation, command_mode::oneoff}, { "setweather", command_target::simulation, command_mode::oneoff },
{"settemperature", command_target::simulation, command_mode::oneoff}, { "settemperature", command_target::simulation, command_mode::oneoff },
{"vehiclemoveforwards", command_target::vehicle, command_mode::oneoff}, { "vehiclemoveforwards", command_target::vehicle, command_mode::oneoff },
{"vehiclemovebackwards", command_target::vehicle, command_mode::oneoff}, { "vehiclemovebackwards", command_target::vehicle, command_mode::oneoff },
{"vehicleboost", command_target::vehicle, command_mode::oneoff}, { "vehicleboost", command_target::vehicle, command_mode::oneoff },
{"debugtoggle", command_target::simulation, command_mode::oneoff}, { "debugtoggle", command_target::simulation, command_mode::oneoff },
{"focuspauseset", command_target::simulation, command_mode::oneoff}, { "focuspauseset", command_target::simulation, command_mode::oneoff },
{"pausetoggle", command_target::simulation, command_mode::oneoff}, { "pausetoggle", command_target::simulation, command_mode::oneoff },
{"entervehicle", command_target::simulation, command_mode::oneoff}, { "entervehicle", command_target::simulation, command_mode::oneoff },
{"resetconsist", command_target::simulation, command_mode::oneoff}, { "resetconsist", command_target::simulation, command_mode::oneoff },
{"fillcompressor", command_target::simulation, command_mode::oneoff}, { "fillcompressor", command_target::simulation, command_mode::oneoff },
{"consistreleaser", command_target::simulation, command_mode::oneoff}, { "consistreleaser", command_target::simulation, command_mode::oneoff },
{"queueevent", command_target::simulation, command_mode::oneoff}, { "queueevent", command_target::simulation, command_mode::oneoff },
{"setlight", command_target::simulation, command_mode::oneoff}, { "setlight", command_target::simulation, command_mode::oneoff },
{"insertmodel", command_target::simulation, command_mode::oneoff}, { "insertmodel", command_target::simulation, command_mode::oneoff },
{"deletemodel", command_target::simulation, command_mode::oneoff}, { "deletemodel", command_target::simulation, command_mode::oneoff },
{"trainsetmove", command_target::simulation, command_mode::oneoff}, { "trainsetmove", command_target::simulation, command_mode::oneoff },
{"consistteleport", command_target::simulation, command_mode::oneoff}, { "consistteleport", command_target::simulation, command_mode::oneoff },
{"pullalarmchain", command_target::simulation, command_mode::oneoff}, { "pullalarmchain", command_target::simulation, command_mode::oneoff },
{"sendaicommand", command_target::simulation, command_mode::oneoff}, { "sendaicommand", command_target::simulation, command_mode::oneoff },
{"spawntrainset", command_target::simulation, command_mode::oneoff}, { "spawntrainset", command_target::simulation, command_mode::oneoff },
{"destroytrainset", command_target::simulation, command_mode::oneoff}, { "destroytrainset", command_target::simulation, command_mode::oneoff },
{"quitsimulation", command_target::simulation, command_mode::oneoff}, { "quitsimulation", command_target::simulation, command_mode::oneoff },
{"wiperswitchincrease", command_target::vehicle, command_mode::oneoff}, {"wiperswitchincrease", command_target::vehicle, command_mode::oneoff},
{"wiperswitchdecrease", command_target::vehicle, command_mode::oneoff}, {"wiperswitchdecrease", command_target::vehicle, command_mode::oneoff},
}; };
// Maps of command and coresponding strings // Maps of command and coresponding strings
std::unordered_map<std::string, user_command> commandMap = {{"aidriverdisable", user_command::aidriverdisable}, std::unordered_map<std::string, user_command> commandMap = {
{"aidriverdisable", user_command::aidriverdisable},
{"jointcontrollerset", user_command::jointcontrollerset}, {"jointcontrollerset", user_command::jointcontrollerset},
{"mastercontrollerincrease", user_command::mastercontrollerincrease}, {"mastercontrollerincrease", user_command::mastercontrollerincrease},
{"mastercontrollerincreasefast", user_command::mastercontrollerincreasefast}, {"mastercontrollerincreasefast", user_command::mastercontrollerincreasefast},