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

Command order fix

Browse Source
This commit is contained in:
Hirek
2025-03-16 17:06:37 +01:00
parent 5ad3789d27
commit d5c89e365c
2 changed files with 977 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1409
command.cpp
View File

File diff suppressed because it is too large Load Diff

543
command.h
View File

@@ -13,278 +13,279 @@ http://mozilla.org/MPL/2.0/.
#include <queue> #include <queue>
#include <unordered_set> #include <unordered_set>
enum class user_command { enum class user_command
{
aidriverenable = 0, aidriverenable = 0,
aidriverdisable, aidriverdisable,
jointcontrollerset, jointcontrollerset,
mastercontrollerincrease, mastercontrollerincrease,
mastercontrollerincreasefast, mastercontrollerincreasefast,
mastercontrollerdecrease, mastercontrollerdecrease,
mastercontrollerdecreasefast, mastercontrollerdecreasefast,
mastercontrollerset, mastercontrollerset,
secondcontrollerincrease, secondcontrollerincrease,
secondcontrollerincreasefast, secondcontrollerincreasefast,
secondcontrollerdecrease, secondcontrollerdecrease,
secondcontrollerdecreasefast, secondcontrollerdecreasefast,
secondcontrollerset, secondcontrollerset,
mucurrentindicatorothersourceactivate, mucurrentindicatorothersourceactivate,
independentbrakeincrease, independentbrakeincrease,
independentbrakeincreasefast, independentbrakeincreasefast,
independentbrakedecrease, independentbrakedecrease,
independentbrakedecreasefast, independentbrakedecreasefast,
independentbrakeset, independentbrakeset,
independentbrakebailoff, independentbrakebailoff,
universalbrakebutton1, universalbrakebutton1,
universalbrakebutton2, universalbrakebutton2,
universalbrakebutton3, universalbrakebutton3,
trainbrakeincrease, trainbrakeincrease,
trainbrakedecrease, trainbrakedecrease,
trainbrakeset, trainbrakeset,
trainbrakecharging, trainbrakecharging,
trainbrakerelease, trainbrakerelease,
trainbrakefirstservice, trainbrakefirstservice,
trainbrakeservice, trainbrakeservice,
trainbrakefullservice, trainbrakefullservice,
trainbrakehandleoff, trainbrakehandleoff,
trainbrakeemergency, trainbrakeemergency,
trainbrakebasepressureincrease, trainbrakebasepressureincrease,
trainbrakebasepressuredecrease, trainbrakebasepressuredecrease,
trainbrakebasepressurereset, trainbrakebasepressurereset,
trainbrakeoperationtoggle, trainbrakeoperationtoggle,
manualbrakeincrease, manualbrakeincrease,
manualbrakedecrease, manualbrakedecrease,
alarmchaintoggle, alarmchaintoggle,
alarmchainenable, alarmchainenable,
alarmchaindisable, alarmchaindisable,
wheelspinbrakeactivate, wheelspinbrakeactivate,
sandboxactivate, sandboxactivate,
autosandboxtoggle, autosandboxtoggle,
autosandboxactivate, autosandboxactivate,
autosandboxdeactivate, autosandboxdeactivate,
reverserincrease, reverserincrease,
reverserdecrease, reverserdecrease,
reverserforwardhigh, reverserforwardhigh,
reverserforward, reverserforward,
reverserneutral, reverserneutral,
reverserbackward, reverserbackward,
waterpumpbreakertoggle, waterpumpbreakertoggle,
waterpumpbreakerclose, waterpumpbreakerclose,
waterpumpbreakeropen, waterpumpbreakeropen,
waterpumptoggle, waterpumptoggle,
waterpumpenable, waterpumpenable,
waterpumpdisable, waterpumpdisable,
waterheaterbreakertoggle, waterheaterbreakertoggle,
waterheaterbreakerclose, waterheaterbreakerclose,
waterheaterbreakeropen, waterheaterbreakeropen,
waterheatertoggle, waterheatertoggle,
waterheaterenable, waterheaterenable,
waterheaterdisable, waterheaterdisable,
watercircuitslinktoggle, watercircuitslinktoggle,
watercircuitslinkenable, watercircuitslinkenable,
watercircuitslinkdisable, watercircuitslinkdisable,
fuelpumptoggle, fuelpumptoggle,
fuelpumpenable, fuelpumpenable,
fuelpumpdisable, fuelpumpdisable,
oilpumptoggle, oilpumptoggle,
oilpumpenable, oilpumpenable,
oilpumpdisable, oilpumpdisable,
linebreakertoggle, linebreakertoggle,
linebreakeropen, linebreakeropen,
linebreakerclose, linebreakerclose,
convertertoggle, convertertoggle,
converterenable, converterenable,
converterdisable, converterdisable,
convertertogglelocal, convertertogglelocal,
converteroverloadrelayreset, converteroverloadrelayreset,
compressortoggle, compressortoggle,
compressorenable, compressorenable,
compressordisable, compressordisable,
compressortogglelocal, compressortogglelocal,
compressorpresetactivatenext, compressorpresetactivatenext,
compressorpresetactivateprevious, compressorpresetactivateprevious,
compressorpresetactivatedefault, compressorpresetactivatedefault,
motoroverloadrelaythresholdtoggle, motoroverloadrelaythresholdtoggle,
motoroverloadrelaythresholdsetlow, motoroverloadrelaythresholdsetlow,
motoroverloadrelaythresholdsethigh, motoroverloadrelaythresholdsethigh,
motoroverloadrelayreset, motoroverloadrelayreset,
universalrelayreset1, universalrelayreset1,
universalrelayreset2, universalrelayreset2,
universalrelayreset3, universalrelayreset3,
notchingrelaytoggle, notchingrelaytoggle,
epbrakecontroltoggle, epbrakecontroltoggle,
epbrakecontrolenable, epbrakecontrolenable,
epbrakecontroldisable, epbrakecontroldisable,
trainbrakeoperationmodeincrease, trainbrakeoperationmodeincrease,
trainbrakeoperationmodedecrease, trainbrakeoperationmodedecrease,
brakeactingspeedincrease, brakeactingspeedincrease,
brakeactingspeeddecrease, brakeactingspeeddecrease,
brakeactingspeedsetcargo, brakeactingspeedsetcargo,
brakeactingspeedsetpassenger, brakeactingspeedsetpassenger,
brakeactingspeedsetrapid, brakeactingspeedsetrapid,
brakeloadcompensationincrease, brakeloadcompensationincrease,
brakeloadcompensationdecrease, brakeloadcompensationdecrease,
mubrakingindicatortoggle, mubrakingindicatortoggle,
alerteracknowledge, alerteracknowledge,
cabsignalacknowledge, cabsignalacknowledge,
hornlowactivate, hornlowactivate,
hornhighactivate, hornhighactivate,
whistleactivate, whistleactivate,
radiotoggle, radiotoggle,
radioenable, radioenable,
radiodisable, radiodisable,
radiochannelincrease, radiochannelincrease,
radiochanneldecrease, radiochanneldecrease,
radiochannelset, radiochannelset,
radiostopsend, radiostopsend,
radiostopenable, radiostopenable,
radiostopdisable, radiostopdisable,
radiostoptest, radiostoptest,
radiocall3send, radiocall3send,
radiovolumeincrease, radiovolumeincrease,
radiovolumedecrease, radiovolumedecrease,
radiovolumeset, radiovolumeset,
cabchangeforward, cabchangeforward,
cabchangebackward, cabchangebackward,
modernlightdimmerdecrease, modernlightdimmerdecrease,
modernlightdimmerincrease, modernlightdimmerincrease,
viewturn, viewturn,
movehorizontal, movehorizontal,
movehorizontalfast, movehorizontalfast,
movevertical, movevertical,
moveverticalfast, moveverticalfast,
moveleft, moveleft,
moveright, moveright,
moveforward, moveforward,
moveback, moveback,
moveup, moveup,
movedown, movedown,
nearestcarcouplingincrease, nearestcarcouplingincrease,
nearestcarcouplingdisconnect, nearestcarcouplingdisconnect,
nearestcarcoupleradapterattach, nearestcarcoupleradapterattach,
nearestcarcoupleradapterremove, nearestcarcoupleradapterremove,
occupiedcarcouplingdisconnect, occupiedcarcouplingdisconnect,
occupiedcarcouplingdisconnectback, occupiedcarcouplingdisconnectback,
doortoggleleft, doortoggleleft,
doortoggleright, doortoggleright,
doorpermitleft, doorpermitleft,
doorpermitright, doorpermitright,
doorpermitpresetactivatenext, doorpermitpresetactivatenext,
doorpermitpresetactivateprevious, doorpermitpresetactivateprevious,
dooropenleft, dooropenleft,
dooropenright, dooropenright,
dooropenall, dooropenall,
doorcloseleft, doorcloseleft,
doorcloseright, doorcloseright,
doorcloseall, doorcloseall,
doorsteptoggle, doorsteptoggle,
doormodetoggle, doormodetoggle,
mirrorstoggle, mirrorstoggle,
departureannounce, departureannounce,
doorlocktoggle, doorlocktoggle,
pantographcompressorvalvetoggle, pantographcompressorvalvetoggle,
pantographcompressorvalveenable, pantographcompressorvalveenable,
pantographcompressorvalvedisable, pantographcompressorvalvedisable,
pantographcompressoractivate, pantographcompressoractivate,
pantographtogglefront, pantographtogglefront,
pantographtogglerear, pantographtogglerear,
pantographraisefront, pantographraisefront,
pantographraiserear, pantographraiserear,
pantographlowerfront, pantographlowerfront,
pantographlowerrear, pantographlowerrear,
pantographlowerall, pantographlowerall,
pantographselectnext, pantographselectnext,
pantographselectprevious, pantographselectprevious,
pantographtoggleselected, pantographtoggleselected,
pantographraiseselected, pantographraiseselected,
pantographlowerselected, pantographlowerselected,
pantographvalvesupdate, pantographvalvesupdate,
pantographvalvesoff, pantographvalvesoff,
heatingtoggle, heatingtoggle,
heatingenable, heatingenable,
heatingdisable, heatingdisable,
lightspresetactivatenext, lightspresetactivatenext,
lightspresetactivateprevious, lightspresetactivateprevious,
headlighttoggleleft, headlighttoggleleft,
headlightenableleft, headlightenableleft,
headlightdisableleft, headlightdisableleft,
headlighttoggleright, headlighttoggleright,
headlightenableright, headlightenableright,
headlightdisableright, headlightdisableright,
headlighttoggleupper, headlighttoggleupper,
headlightenableupper, headlightenableupper,
headlightdisableupper, headlightdisableupper,
redmarkertoggleleft, redmarkertoggleleft,
redmarkerenableleft, redmarkerenableleft,
redmarkerdisableleft, redmarkerdisableleft,
redmarkertoggleright, redmarkertoggleright,
redmarkerenableright, redmarkerenableright,
redmarkerdisableright, redmarkerdisableright,
headlighttogglerearleft, headlighttogglerearleft,
headlightenablerearleft, headlightenablerearleft,
headlightdisablerearleft, headlightdisablerearleft,
headlighttogglerearright, headlighttogglerearright,
headlightenablerearright, headlightenablerearright,
headlightdisablerearright, headlightdisablerearright,
headlighttogglerearupper, headlighttogglerearupper,
headlightenablerearupper, headlightenablerearupper,
headlightdisablerearupper, headlightdisablerearupper,
redmarkertogglerearleft, redmarkertogglerearleft,
redmarkerenablerearleft, redmarkerenablerearleft,
redmarkerdisablerearleft, redmarkerdisablerearleft,
redmarkertogglerearright, redmarkertogglerearright,
redmarkerenablerearright, redmarkerenablerearright,
redmarkerdisablerearright, redmarkerdisablerearright,
redmarkerstoggle, redmarkerstoggle,
endsignalstoggle, endsignalstoggle,
headlightsdimtoggle, headlightsdimtoggle,
headlightsdimenable, headlightsdimenable,
headlightsdimdisable, headlightsdimdisable,
motorconnectorsopen, motorconnectorsopen,
motorconnectorsclose, motorconnectorsclose,
motordisconnect, motordisconnect,
interiorlighttoggle, interiorlighttoggle,
interiorlightenable, interiorlightenable,
interiorlightdisable, interiorlightdisable,
interiorlightdimtoggle, interiorlightdimtoggle,
interiorlightdimenable, interiorlightdimenable,
interiorlightdimdisable, interiorlightdimdisable,
compartmentlightstoggle, compartmentlightstoggle,
compartmentlightsenable, compartmentlightsenable,
compartmentlightsdisable, compartmentlightsdisable,
instrumentlighttoggle, instrumentlighttoggle,
instrumentlightenable, instrumentlightenable,
instrumentlightdisable, instrumentlightdisable,
dashboardlighttoggle, dashboardlighttoggle,
dashboardlightenable, dashboardlightenable,
dashboardlightdisable, dashboardlightdisable,
timetablelighttoggle, timetablelighttoggle,
timetablelightenable, timetablelightenable,
timetablelightdisable, timetablelightdisable,
generictoggle0, generictoggle0,
generictoggle1, generictoggle1,
generictoggle2, generictoggle2,
generictoggle3, generictoggle3,
generictoggle4, generictoggle4,
generictoggle5, generictoggle5,
generictoggle6, generictoggle6,
generictoggle7, generictoggle7,
generictoggle8, generictoggle8,
generictoggle9, generictoggle9,
batterytoggle, batterytoggle,
batteryenable, batteryenable,
batterydisable, batterydisable,
cabactivationtoggle, cabactivationtoggle,
cabactivationenable, cabactivationenable,
cabactivationdisable, cabactivationdisable,
motorblowerstogglefront, motorblowerstogglefront,
motorblowerstogglerear, motorblowerstogglerear,
motorblowersdisableall, motorblowersdisableall,
coolingfanstoggle, coolingfanstoggle,
tempomattoggle, tempomattoggle,
springbraketoggle, springbraketoggle,
springbrakeenable, springbrakeenable,
springbrakedisable, springbrakedisable,
@@ -292,7 +293,7 @@ enum class user_command {
springbrakeshutoffenable, springbrakeshutoffenable,
springbrakeshutoffdisable, springbrakeshutoffdisable,
springbrakerelease, springbrakerelease,
distancecounteractivate, distancecounteractivate,
speedcontrolincrease, speedcontrolincrease,
speedcontroldecrease, speedcontroldecrease,
speedcontrolpowerincrease, speedcontrolpowerincrease,
@@ -343,38 +344,38 @@ enum class user_command {
invertertoggle10, invertertoggle10,
invertertoggle11, invertertoggle11,
invertertoggle12, invertertoggle12,
globalradiostop, globalradiostop,
timejump, timejump,
timejumplarge, timejumplarge,
timejumpsmall, timejumpsmall,
setdatetime, setdatetime,
setweather, setweather,
settemperature, settemperature,
vehiclemoveforwards, vehiclemoveforwards,
vehiclemovebackwards, vehiclemovebackwards,
vehicleboost, vehicleboost,
debugtoggle, debugtoggle,
focuspauseset, focuspauseset,
pausetoggle, pausetoggle,
entervehicle, entervehicle,
resetconsist, resetconsist,
fillcompressor, fillcompressor,
consistreleaser, consistreleaser,
queueevent, queueevent,
setlight, setlight,
insertmodel, insertmodel,
deletemodel, deletemodel,
dynamicmove, dynamicmove,
consistteleport, consistteleport,
pullalarmchain, pullalarmchain,
sendaicommand, sendaicommand,
spawntrainset, spawntrainset,
destroytrainset, destroytrainset,
quitsimulation, quitsimulation,
wiperswitchincrease, wiperswitchincrease,
wiperswitchdecrease, wiperswitchdecrease,
none = -1 none = -1
}; };
enum class command_target { enum class command_target {