16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 17:09:19 +02:00

conversion of remaining train controls to the new control system, fix for potentially incorrect rendering of flex track pieces

This commit is contained in:
tmj-fstate
2018-01-10 20:46:58 +01:00
parent 377740dfad
commit c166c5429e
7 changed files with 578 additions and 233 deletions

View File

@@ -14,6 +14,8 @@ http://mozilla.org/MPL/2.0/.
enum class user_command {
aidriverenable,
aidriverdisable,
mastercontrollerincrease,
mastercontrollerincreasefast,
mastercontrollerdecrease,
@@ -35,7 +37,12 @@ enum class user_command {
trainbrakefirstservice,
trainbrakeservice,
trainbrakefullservice,
trainbrakehandleoff,
trainbrakeemergency,
trainbrakebasepressureincrease,
trainbrakebasepressuredecrease,
trainbrakebasepressurereset,
trainbrakeoperationtoggle,
manualbrakeincrease,
manualbrakedecrease,
alarmchaintoggle,
@@ -55,12 +62,18 @@ enum class user_command {
epbrakecontroltoggle,
brakeactingspeedincrease,
brakeactingspeeddecrease,
brakeloadcompensationincrease,
brakeloadcompensationdecrease,
mubrakingindicatortoggle,
alerteracknowledge,
hornlowactivate,
hornhighactivate,
radiotoggle,
radiochannelincrease,
radiochanneldecrease,
radiostoptest,
cabchangeforward,
cabchangebackward,
viewturn,
movehorizontal,
@@ -73,15 +86,9 @@ enum class user_command {
moveback,
moveup,
movedown,
/*
const int k_CabForward = 42;
const int k_CabBackward = 43;
const int k_Couple = 44;
const int k_DeCouple = 45;
const int k_ProgramQuit = 46;
// const int k_ProgramPause= 47;
const int k_ProgramHelp = 48;
*/
carcouplingincrease,
carcouplingdisconnect,
doortoggleleft,
doortoggleright,
departureannounce,
@@ -92,9 +99,6 @@ const int k_ProgramHelp = 48;
pantographtogglerear,
pantographlowerall,
heatingtoggle,
/*
// const int k_FreeFlyMode= 59;
*/
lightspresetactivatenext,
lightspresetactivateprevious,
headlighttoggleleft,
@@ -107,16 +111,14 @@ const int k_ProgramHelp = 48;
headlighttogglerearupper,
redmarkertogglerearleft,
redmarkertogglerearright,
redmarkerstoggle,
endsignalstoggle,
headlightsdimtoggle,
motorconnectorsopen,
motordisconnect,
interiorlighttoggle,
interiorlightdimtoggle,
instrumentlighttoggle,
/*
const int k_EndSign = 70;
const int k_Active = 71;
*/
generictoggle0,
generictoggle1,
generictoggle2,
@@ -128,9 +130,7 @@ const int k_Active = 71;
generictoggle8,
generictoggle9,
batterytoggle,
/*
const int k_WalkMode = 73;
*/
none = -1
};