mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 07:29:20 +02:00
Fix/sonar maintainability rebased (#209)
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
This commit is contained in:
jerrrrycho
@@ -22,276 +22,277 @@ driverkeyboard_input::init() {
|
||||
|
||||
void
|
||||
driverkeyboard_input::default_bindings() {
|
||||
using enum user_command;
|
||||
|
||||
m_bindingsetups = {
|
||||
{ user_command::aidriverenable, {GLFW_KEY_Q | keymodifier::shift, ""} },
|
||||
{ user_command::aidriverdisable, {GLFW_KEY_Q, ""} },
|
||||
{ aidriverenable, {GLFW_KEY_Q | keymodifier::shift, ""} },
|
||||
{ aidriverdisable, {GLFW_KEY_Q, ""} },
|
||||
// jointcontrollerset,
|
||||
{ user_command::mastercontrollerincrease, {GLFW_KEY_KP_ADD, ""} },
|
||||
{ user_command::mastercontrollerincreasefast, {GLFW_KEY_KP_ADD | keymodifier::shift, ""} },
|
||||
{ user_command::mastercontrollerdecrease, {GLFW_KEY_KP_SUBTRACT, ""} },
|
||||
{ user_command::mastercontrollerdecreasefast, {GLFW_KEY_KP_SUBTRACT | keymodifier::shift, ""} },
|
||||
{ mastercontrollerincrease, {GLFW_KEY_KP_ADD, ""} },
|
||||
{ mastercontrollerincreasefast, {GLFW_KEY_KP_ADD | keymodifier::shift, ""} },
|
||||
{ mastercontrollerdecrease, {GLFW_KEY_KP_SUBTRACT, ""} },
|
||||
{ mastercontrollerdecreasefast, {GLFW_KEY_KP_SUBTRACT | keymodifier::shift, ""} },
|
||||
// mastercontrollerset,
|
||||
|
||||
{ user_command::dynamicbrakecontrollerincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} },
|
||||
{ user_command::dynamicbrakecontrollerdecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} },
|
||||
{ dynamicbrakecontrollerincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} },
|
||||
{ dynamicbrakecontrollerdecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} },
|
||||
// mastercontrollerset,
|
||||
{ user_command::dynamicbrakecontrollerincreasefast, {GLFW_KEY_KP_3 | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ user_command::dynamicbrakecontrollerdecreasefast, {GLFW_KEY_KP_9 | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ dynamicbrakecontrollerincreasefast, {GLFW_KEY_KP_3 | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ dynamicbrakecontrollerdecreasefast, {GLFW_KEY_KP_9 | keymodifier::control | keymodifier::shift, ""} },
|
||||
|
||||
{ user_command::secondcontrollerincrease, {GLFW_KEY_KP_DIVIDE, ""} },
|
||||
{ user_command::secondcontrollerincreasefast, {GLFW_KEY_KP_DIVIDE | keymodifier::shift, ""} },
|
||||
{ user_command::secondcontrollerdecrease, {GLFW_KEY_KP_MULTIPLY, ""} },
|
||||
{ user_command::secondcontrollerdecreasefast, {GLFW_KEY_KP_MULTIPLY | keymodifier::shift, ""} },
|
||||
{ secondcontrollerincrease, {GLFW_KEY_KP_DIVIDE, ""} },
|
||||
{ secondcontrollerincreasefast, {GLFW_KEY_KP_DIVIDE | keymodifier::shift, ""} },
|
||||
{ secondcontrollerdecrease, {GLFW_KEY_KP_MULTIPLY, ""} },
|
||||
{ secondcontrollerdecreasefast, {GLFW_KEY_KP_MULTIPLY | keymodifier::shift, ""} },
|
||||
// secondcontrollerset,
|
||||
{ user_command::mucurrentindicatorothersourceactivate, {GLFW_KEY_Z | keymodifier::shift, ""} },
|
||||
{ user_command::independentbrakeincrease, {GLFW_KEY_KP_1, ""} },
|
||||
{ user_command::independentbrakeincreasefast, {GLFW_KEY_KP_1 | keymodifier::shift, ""} },
|
||||
{ user_command::independentbrakedecrease, {GLFW_KEY_KP_7, ""} },
|
||||
{ user_command::independentbrakedecreasefast, {GLFW_KEY_KP_7 | keymodifier::shift, ""} },
|
||||
{ mucurrentindicatorothersourceactivate, {GLFW_KEY_Z | keymodifier::shift, ""} },
|
||||
{ independentbrakeincrease, {GLFW_KEY_KP_1, ""} },
|
||||
{ independentbrakeincreasefast, {GLFW_KEY_KP_1 | keymodifier::shift, ""} },
|
||||
{ independentbrakedecrease, {GLFW_KEY_KP_7, ""} },
|
||||
{ independentbrakedecreasefast, {GLFW_KEY_KP_7 | keymodifier::shift, ""} },
|
||||
// independentbrakeset,
|
||||
{ user_command::independentbrakebailoff, {GLFW_KEY_KP_4, ""} },
|
||||
{ independentbrakebailoff, {GLFW_KEY_KP_4, ""} },
|
||||
// universalbrakebutton1,
|
||||
// universalbrakebutton2,
|
||||
// universalbrakebutton3,
|
||||
{ user_command::trainbrakeincrease, {GLFW_KEY_KP_3, ""} },
|
||||
{ user_command::trainbrakedecrease, {GLFW_KEY_KP_9, ""} },
|
||||
{ trainbrakeincrease, {GLFW_KEY_KP_3, ""} },
|
||||
{ trainbrakedecrease, {GLFW_KEY_KP_9, ""} },
|
||||
// trainbrakeset,
|
||||
{ user_command::trainbrakecharging, {GLFW_KEY_KP_DECIMAL, ""} },
|
||||
{ user_command::trainbrakerelease, {GLFW_KEY_KP_6, ""} },
|
||||
{ user_command::trainbrakefirstservice, {GLFW_KEY_KP_8, ""} },
|
||||
{ user_command::trainbrakeservice, {GLFW_KEY_KP_5, ""} },
|
||||
{ user_command::trainbrakefullservice, {GLFW_KEY_KP_2, ""} },
|
||||
{ user_command::trainbrakehandleoff, {GLFW_KEY_KP_5 | keymodifier::control, ""} },
|
||||
{ user_command::trainbrakeemergency, {GLFW_KEY_KP_0, ""} },
|
||||
{ user_command::trainbrakebasepressureincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} },
|
||||
{ user_command::trainbrakebasepressuredecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} },
|
||||
{ user_command::trainbrakebasepressurereset, {GLFW_KEY_KP_6 | keymodifier::control, ""} },
|
||||
{ user_command::trainbrakeoperationtoggle, {GLFW_KEY_KP_4 | keymodifier::control, ""} },
|
||||
{ user_command::manualbrakeincrease, {GLFW_KEY_KP_1 | keymodifier::control, ""} },
|
||||
{ user_command::manualbrakedecrease, {GLFW_KEY_KP_7 | keymodifier::control, ""} },
|
||||
{ user_command::alarmchaintoggle, {GLFW_KEY_B | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ trainbrakecharging, {GLFW_KEY_KP_DECIMAL, ""} },
|
||||
{ trainbrakerelease, {GLFW_KEY_KP_6, ""} },
|
||||
{ trainbrakefirstservice, {GLFW_KEY_KP_8, ""} },
|
||||
{ trainbrakeservice, {GLFW_KEY_KP_5, ""} },
|
||||
{ trainbrakefullservice, {GLFW_KEY_KP_2, ""} },
|
||||
{ trainbrakehandleoff, {GLFW_KEY_KP_5 | keymodifier::control, ""} },
|
||||
{ trainbrakeemergency, {GLFW_KEY_KP_0, ""} },
|
||||
{ trainbrakebasepressureincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} },
|
||||
{ trainbrakebasepressuredecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} },
|
||||
{ trainbrakebasepressurereset, {GLFW_KEY_KP_6 | keymodifier::control, ""} },
|
||||
{ trainbrakeoperationtoggle, {GLFW_KEY_KP_4 | keymodifier::control, ""} },
|
||||
{ manualbrakeincrease, {GLFW_KEY_KP_1 | keymodifier::control, ""} },
|
||||
{ manualbrakedecrease, {GLFW_KEY_KP_7 | keymodifier::control, ""} },
|
||||
{ alarmchaintoggle, {GLFW_KEY_B | keymodifier::shift | keymodifier::control, ""} },
|
||||
// alarmchainenable,
|
||||
// alarmchaindisable,
|
||||
{ user_command::wheelspinbrakeactivate, {GLFW_KEY_KP_ENTER, ""} },
|
||||
{ user_command::sandboxactivate, {GLFW_KEY_S | keymodifier::shift, ""} },
|
||||
{ wheelspinbrakeactivate, {GLFW_KEY_KP_ENTER, ""} },
|
||||
{ sandboxactivate, {GLFW_KEY_S | keymodifier::shift, ""} },
|
||||
// autosandboxtoggle,
|
||||
// autosandboxactivate,
|
||||
// autosandboxdeactivate,
|
||||
{ user_command::reverserincrease, {GLFW_KEY_D, ""} },
|
||||
{ user_command::reverserdecrease, {GLFW_KEY_R, ""} },
|
||||
{ reverserincrease, {GLFW_KEY_D, ""} },
|
||||
{ reverserdecrease, {GLFW_KEY_R, ""} },
|
||||
// reverserforwardhigh,
|
||||
// reverserforward,
|
||||
// reverserneutral,
|
||||
// reverserbackward,
|
||||
{ user_command::waterpumpbreakertoggle, {GLFW_KEY_W | keymodifier::control, ""} },
|
||||
{ waterpumpbreakertoggle, {GLFW_KEY_W | keymodifier::control, ""} },
|
||||
// waterpumpbreakerclose,
|
||||
// waterpumpbreakeropen,
|
||||
{ user_command::waterpumptoggle, {GLFW_KEY_W, ""} },
|
||||
{ waterpumptoggle, {GLFW_KEY_W, ""} },
|
||||
// waterpumpenable,
|
||||
// waterpumpdisable,
|
||||
{ user_command::waterheaterbreakertoggle, {GLFW_KEY_W | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ waterheaterbreakertoggle, {GLFW_KEY_W | keymodifier::control | keymodifier::shift, ""} },
|
||||
// waterheaterbreakerclose,
|
||||
// waterheaterbreakeropen,
|
||||
{ user_command::waterheatertoggle, {GLFW_KEY_W | keymodifier::shift, ""} },
|
||||
{ waterheatertoggle, {GLFW_KEY_W | keymodifier::shift, ""} },
|
||||
// waterheaterenable,
|
||||
// waterheaterdisable,
|
||||
{ user_command::watercircuitslinktoggle, {GLFW_KEY_H | keymodifier::shift, ""} },
|
||||
{ watercircuitslinktoggle, {GLFW_KEY_H | keymodifier::shift, ""} },
|
||||
// watercircuitslinkenable,
|
||||
// watercircuitslinkdisable,
|
||||
{ user_command::fuelpumptoggle, {GLFW_KEY_F, ""} },
|
||||
{ fuelpumptoggle, {GLFW_KEY_F, ""} },
|
||||
// fuelpumpenable,
|
||||
// fuelpumpdisable,
|
||||
{ user_command::oilpumptoggle, {GLFW_KEY_F | keymodifier::shift, ""} },
|
||||
{ oilpumptoggle, {GLFW_KEY_F | keymodifier::shift, ""} },
|
||||
// oilpumpenable,
|
||||
// oilpumpdisable,
|
||||
{ user_command::linebreakertoggle, {GLFW_KEY_M, ""} },
|
||||
{ linebreakertoggle, {GLFW_KEY_M, ""} },
|
||||
// linebreakeropen,
|
||||
// linebreakerclose,
|
||||
{ user_command::convertertoggle, {GLFW_KEY_X, ""} },
|
||||
{ convertertoggle, {GLFW_KEY_X, ""} },
|
||||
// converterenable,
|
||||
// converterdisable,
|
||||
{ user_command::convertertogglelocal, {GLFW_KEY_X | keymodifier::shift, ""} },
|
||||
{ user_command::converteroverloadrelayreset, {GLFW_KEY_N | keymodifier::control, ""} },
|
||||
{ user_command::compressortoggle, {GLFW_KEY_C, ""} },
|
||||
{ convertertogglelocal, {GLFW_KEY_X | keymodifier::shift, ""} },
|
||||
{ converteroverloadrelayreset, {GLFW_KEY_N | keymodifier::control, ""} },
|
||||
{ compressortoggle, {GLFW_KEY_C, ""} },
|
||||
// compressorenable,
|
||||
// compressordisable,
|
||||
{ user_command::compressortogglelocal, {GLFW_KEY_C | keymodifier::shift, ""} },
|
||||
{ compressortogglelocal, {GLFW_KEY_C | keymodifier::shift, ""} },
|
||||
// compressorpresetactivatenext,
|
||||
// compressorpresetactivateprevious,
|
||||
// compressorpresetactivatedefault,
|
||||
{ user_command::motoroverloadrelaythresholdtoggle, {GLFW_KEY_F | keymodifier::control, ""} },
|
||||
{ motoroverloadrelaythresholdtoggle, {GLFW_KEY_F | keymodifier::control, ""} },
|
||||
// motoroverloadrelaythresholdsetlow,
|
||||
// motoroverloadrelaythresholdsethigh,
|
||||
{ user_command::motoroverloadrelayreset, {GLFW_KEY_N, ""} },
|
||||
{ motoroverloadrelayreset, {GLFW_KEY_N, ""} },
|
||||
// universalrelayreset1,
|
||||
// universalrelayreset2,
|
||||
// universalrelayreset3,
|
||||
{ user_command::notchingrelaytoggle, {GLFW_KEY_G, ""} },
|
||||
{ user_command::epbrakecontroltoggle, {GLFW_KEY_Z | keymodifier::control, ""} },
|
||||
{ notchingrelaytoggle, {GLFW_KEY_G, ""} },
|
||||
{ epbrakecontroltoggle, {GLFW_KEY_Z | keymodifier::control, ""} },
|
||||
// epbrakecontrolenable
|
||||
// epbrakecontroldisable
|
||||
{ user_command::trainbrakeoperationmodeincrease, {GLFW_KEY_KP_2 | keymodifier::control, ""} },
|
||||
{ user_command::trainbrakeoperationmodedecrease, {GLFW_KEY_KP_8 | keymodifier::control, ""} },
|
||||
{ user_command::brakeactingspeedincrease, {GLFW_KEY_B | keymodifier::shift, ""} },
|
||||
{ user_command::brakeactingspeeddecrease, {GLFW_KEY_B, ""} },
|
||||
{ trainbrakeoperationmodeincrease, {GLFW_KEY_KP_2 | keymodifier::control, ""} },
|
||||
{ trainbrakeoperationmodedecrease, {GLFW_KEY_KP_8 | keymodifier::control, ""} },
|
||||
{ brakeactingspeedincrease, {GLFW_KEY_B | keymodifier::shift, ""} },
|
||||
{ brakeactingspeeddecrease, {GLFW_KEY_B, ""} },
|
||||
// brakeactingspeedsetcargo,
|
||||
// brakeactingspeedsetpassenger,
|
||||
// brakeactingspeedsetrapid,
|
||||
{ user_command::brakeloadcompensationincrease, {GLFW_KEY_H | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ user_command::brakeloadcompensationdecrease, {GLFW_KEY_H | keymodifier::control, ""} },
|
||||
{ user_command::mubrakingindicatortoggle, {GLFW_KEY_L | keymodifier::shift, ""} },
|
||||
{ user_command::alerteracknowledge, {GLFW_KEY_SPACE, ""} },
|
||||
{ user_command::hornlowactivate, {GLFW_KEY_A, ""} },
|
||||
{ user_command::hornhighactivate, {GLFW_KEY_S, ""} },
|
||||
{ user_command::whistleactivate, {GLFW_KEY_Z, ""} },
|
||||
{ user_command::radiotoggle, {GLFW_KEY_R | keymodifier::control, ""} },
|
||||
{ brakeloadcompensationincrease, {GLFW_KEY_H | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ brakeloadcompensationdecrease, {GLFW_KEY_H | keymodifier::control, ""} },
|
||||
{ mubrakingindicatortoggle, {GLFW_KEY_L | keymodifier::shift, ""} },
|
||||
{ alerteracknowledge, {GLFW_KEY_SPACE, ""} },
|
||||
{ hornlowactivate, {GLFW_KEY_A, ""} },
|
||||
{ hornhighactivate, {GLFW_KEY_S, ""} },
|
||||
{ whistleactivate, {GLFW_KEY_Z, ""} },
|
||||
{ radiotoggle, {GLFW_KEY_R | keymodifier::control, ""} },
|
||||
// radioenable
|
||||
// radiodisable
|
||||
{ user_command::radiochannelincrease, {GLFW_KEY_EQUAL, ""} },
|
||||
{ user_command::radiochanneldecrease, {GLFW_KEY_MINUS, ""} },
|
||||
{ radiochannelincrease, {GLFW_KEY_EQUAL, ""} },
|
||||
{ radiochanneldecrease, {GLFW_KEY_MINUS, ""} },
|
||||
// radiochannelset
|
||||
{ user_command::radiostopsend, {GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ radiostopsend, {GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control, ""} },
|
||||
// radiostopenable
|
||||
// radiostopdisable
|
||||
{ user_command::radiostoptest, {GLFW_KEY_R | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ user_command::radiocall3send, {GLFW_KEY_BACKSPACE, ""} },
|
||||
{ radiostoptest, {GLFW_KEY_R | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ radiocall3send, {GLFW_KEY_BACKSPACE, ""} },
|
||||
// radiovolumeincrease,
|
||||
// radiovolumedecrease,
|
||||
// radiovolumeset,
|
||||
{ user_command::cabchangeforward, {GLFW_KEY_HOME, ""} },
|
||||
{ user_command::cabchangebackward, {GLFW_KEY_END, ""} },
|
||||
{ cabchangeforward, {GLFW_KEY_HOME, ""} },
|
||||
{ cabchangebackward, {GLFW_KEY_END, ""} },
|
||||
// viewturn,
|
||||
// movehorizontal,
|
||||
// movehorizontalfast,
|
||||
// movevertical,
|
||||
// moveverticalfast,
|
||||
{ user_command::moveleft, {GLFW_KEY_LEFT, "Move left"} },
|
||||
{ user_command::moveright, {GLFW_KEY_RIGHT, "Move right"} },
|
||||
{ user_command::moveforward, {GLFW_KEY_UP, "Move forwards"} },
|
||||
{ user_command::moveback, {GLFW_KEY_DOWN, "Move backwards"} },
|
||||
{ user_command::moveup, {GLFW_KEY_PAGE_UP, "Move up"} },
|
||||
{ user_command::movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} },
|
||||
{ user_command::nearestcarcouplingincrease, {GLFW_KEY_INSERT, ""} },
|
||||
{ user_command::nearestcarcouplingdisconnect, {GLFW_KEY_DELETE, ""} },
|
||||
{ user_command::nearestcarcoupleradapterattach, {GLFW_KEY_INSERT | keymodifier::control, ""} },
|
||||
{ user_command::nearestcarcoupleradapterremove, {GLFW_KEY_DELETE | keymodifier::control, ""} },
|
||||
{ user_command::occupiedcarcouplingdisconnect, {GLFW_KEY_DELETE | keymodifier::shift, ""} },
|
||||
{ user_command::doortoggleleft, {GLFW_KEY_COMMA, ""} },
|
||||
{ user_command::doortoggleright, {GLFW_KEY_PERIOD, ""} },
|
||||
{ user_command::doorpermitleft, {GLFW_KEY_COMMA | keymodifier::shift, ""} },
|
||||
{ user_command::doorpermitright, {GLFW_KEY_PERIOD | keymodifier::shift, ""} },
|
||||
{ user_command::doorpermitpresetactivatenext, {GLFW_KEY_PERIOD | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ user_command::doorpermitpresetactivateprevious, {GLFW_KEY_COMMA | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ moveleft, {GLFW_KEY_LEFT, "Move left"} },
|
||||
{ moveright, {GLFW_KEY_RIGHT, "Move right"} },
|
||||
{ moveforward, {GLFW_KEY_UP, "Move forwards"} },
|
||||
{ moveback, {GLFW_KEY_DOWN, "Move backwards"} },
|
||||
{ moveup, {GLFW_KEY_PAGE_UP, "Move up"} },
|
||||
{ movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} },
|
||||
{ nearestcarcouplingincrease, {GLFW_KEY_INSERT, ""} },
|
||||
{ nearestcarcouplingdisconnect, {GLFW_KEY_DELETE, ""} },
|
||||
{ nearestcarcoupleradapterattach, {GLFW_KEY_INSERT | keymodifier::control, ""} },
|
||||
{ nearestcarcoupleradapterremove, {GLFW_KEY_DELETE | keymodifier::control, ""} },
|
||||
{ occupiedcarcouplingdisconnect, {GLFW_KEY_DELETE | keymodifier::shift, ""} },
|
||||
{ doortoggleleft, {GLFW_KEY_COMMA, ""} },
|
||||
{ doortoggleright, {GLFW_KEY_PERIOD, ""} },
|
||||
{ doorpermitleft, {GLFW_KEY_COMMA | keymodifier::shift, ""} },
|
||||
{ doorpermitright, {GLFW_KEY_PERIOD | keymodifier::shift, ""} },
|
||||
{ doorpermitpresetactivatenext, {GLFW_KEY_PERIOD | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ doorpermitpresetactivateprevious, {GLFW_KEY_COMMA | keymodifier::shift | keymodifier::control, ""} },
|
||||
// dooropenleft,
|
||||
// dooropenright,
|
||||
{ user_command::dooropenall, {GLFW_KEY_SLASH | keymodifier::shift, ""} },
|
||||
{ dooropenall, {GLFW_KEY_SLASH | keymodifier::shift, ""} },
|
||||
// doorcloseleft,
|
||||
// doorcloseright,
|
||||
{ user_command::doorcloseall, {GLFW_KEY_SLASH | keymodifier::control, ""} },
|
||||
{ doorcloseall, {GLFW_KEY_SLASH | keymodifier::control, ""} },
|
||||
// doorsteptoggle,
|
||||
{ user_command::doormodetoggle, {GLFW_KEY_SLASH | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ doormodetoggle, {GLFW_KEY_SLASH | keymodifier::shift | keymodifier::control, ""} },
|
||||
// mirrorstoggle,
|
||||
{ user_command::departureannounce, {GLFW_KEY_SLASH, ""} },
|
||||
{ user_command::doorlocktoggle, {GLFW_KEY_S | keymodifier::control, ""} },
|
||||
{ user_command::pantographcompressorvalvetoggle, {GLFW_KEY_V | keymodifier::control, ""} },
|
||||
{ departureannounce, {GLFW_KEY_SLASH, ""} },
|
||||
{ doorlocktoggle, {GLFW_KEY_S | keymodifier::control, ""} },
|
||||
{ pantographcompressorvalvetoggle, {GLFW_KEY_V | keymodifier::control, ""} },
|
||||
// pantographcompressorvalveenable,
|
||||
// pantographcompressorvalvedisable,
|
||||
{ user_command::pantographcompressoractivate, {GLFW_KEY_V | keymodifier::shift, ""} },
|
||||
{ user_command::pantographtogglefront, {GLFW_KEY_P, ""} },
|
||||
{ user_command::pantographtogglerear, {GLFW_KEY_O, ""} },
|
||||
{ pantographcompressoractivate, {GLFW_KEY_V | keymodifier::shift, ""} },
|
||||
{ pantographtogglefront, {GLFW_KEY_P, ""} },
|
||||
{ pantographtogglerear, {GLFW_KEY_O, ""} },
|
||||
// pantographraisefront,
|
||||
// pantographraiserear,
|
||||
// pantographlowerfront,
|
||||
// pantographlowerrear,
|
||||
{ user_command::pantographlowerall, {GLFW_KEY_P | keymodifier::control, ""} },
|
||||
{ user_command::pantographselectnext, {GLFW_KEY_P | keymodifier::shift, ""} },
|
||||
{ user_command::pantographselectprevious, {GLFW_KEY_O | keymodifier::shift, ""} },
|
||||
{ user_command::pantographtoggleselected, {GLFW_KEY_O | keymodifier::shift | keymodifier::control, ""} },
|
||||
{ pantographlowerall, {GLFW_KEY_P | keymodifier::control, ""} },
|
||||
{ pantographselectnext, {GLFW_KEY_P | keymodifier::shift, ""} },
|
||||
{ pantographselectprevious, {GLFW_KEY_O | keymodifier::shift, ""} },
|
||||
{ pantographtoggleselected, {GLFW_KEY_O | keymodifier::shift | keymodifier::control, ""} },
|
||||
// pantographraiseselected,
|
||||
// pantographlowerselected,
|
||||
// pantographvalvesupdate,
|
||||
// pantographvalvesoff,
|
||||
{ user_command::heatingtoggle, {GLFW_KEY_H, ""} },
|
||||
{ heatingtoggle, {GLFW_KEY_H, ""} },
|
||||
// heatingenable,
|
||||
// heatingdisable,
|
||||
{ user_command::lightspresetactivatenext, {GLFW_KEY_T | keymodifier::shift, ""} },
|
||||
{ user_command::lightspresetactivateprevious, {GLFW_KEY_T, ""} },
|
||||
{ user_command::headlighttoggleleft, {GLFW_KEY_Y, ""} },
|
||||
{ lightspresetactivatenext, {GLFW_KEY_T | keymodifier::shift, ""} },
|
||||
{ lightspresetactivateprevious, {GLFW_KEY_T, ""} },
|
||||
{ headlighttoggleleft, {GLFW_KEY_Y, ""} },
|
||||
// headlightenableleft,
|
||||
// headlightdisableleft,
|
||||
{ user_command::headlighttoggleright, {GLFW_KEY_I, ""} },
|
||||
{ headlighttoggleright, {GLFW_KEY_I, ""} },
|
||||
// headlightenableright,
|
||||
// headlightdisableright,
|
||||
{ user_command::headlighttoggleupper, {GLFW_KEY_U, ""} },
|
||||
{ headlighttoggleupper, {GLFW_KEY_U, ""} },
|
||||
// headlightenableupper,
|
||||
// headlightdisableupper,
|
||||
{ user_command::redmarkertoggleleft, {GLFW_KEY_Y | keymodifier::shift, ""} },
|
||||
{ redmarkertoggleleft, {GLFW_KEY_Y | keymodifier::shift, ""} },
|
||||
// redmarkerenableleft,
|
||||
// redmarkerdisableleft,
|
||||
{ user_command::redmarkertoggleright, {GLFW_KEY_I | keymodifier::shift, ""} },
|
||||
{ redmarkertoggleright, {GLFW_KEY_I | keymodifier::shift, ""} },
|
||||
// redmarkerenableright,
|
||||
// redmarkerdisableright,
|
||||
{ user_command::headlighttogglerearleft, {GLFW_KEY_Y | keymodifier::control, ""} },
|
||||
{ headlighttogglerearleft, {GLFW_KEY_Y | keymodifier::control, ""} },
|
||||
// headlightenablerearleft
|
||||
// headlightdisablerearleft
|
||||
{ user_command::headlighttogglerearright, {GLFW_KEY_I | keymodifier::control, ""} },
|
||||
{ headlighttogglerearright, {GLFW_KEY_I | keymodifier::control, ""} },
|
||||
// headlightenablerearright
|
||||
// headlightdisablerearright
|
||||
{ user_command::headlighttogglerearupper, {GLFW_KEY_U | keymodifier::control, ""} },
|
||||
{ headlighttogglerearupper, {GLFW_KEY_U | keymodifier::control, ""} },
|
||||
// headlightenablerearupper
|
||||
// headlightdisablerearupper
|
||||
{ user_command::redmarkertogglerearleft, {GLFW_KEY_Y | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ redmarkertogglerearleft, {GLFW_KEY_Y | keymodifier::control | keymodifier::shift, ""} },
|
||||
// redmarkerenablerearleft
|
||||
// redmarkerdisablerearleft
|
||||
{ user_command::redmarkertogglerearright, {GLFW_KEY_I | keymodifier::control | keymodifier::shift, ""} },
|
||||
{ redmarkertogglerearright, {GLFW_KEY_I | keymodifier::control | keymodifier::shift, ""} },
|
||||
// redmarkerenablerearright
|
||||
// redmarkerdisablerearright
|
||||
{ user_command::redmarkerstoggle, {GLFW_KEY_E | keymodifier::shift, ""} },
|
||||
{ user_command::endsignalstoggle, {GLFW_KEY_E, ""} },
|
||||
{ user_command::headlightsdimtoggle, {GLFW_KEY_L | keymodifier::control, ""} },
|
||||
{ redmarkerstoggle, {GLFW_KEY_E | keymodifier::shift, ""} },
|
||||
{ endsignalstoggle, {GLFW_KEY_E, ""} },
|
||||
{ headlightsdimtoggle, {GLFW_KEY_L | keymodifier::control, ""} },
|
||||
// headlightsdimenable,
|
||||
// headlightsdimdisable,
|
||||
{ user_command::motorconnectorsopen, {GLFW_KEY_L, ""} },
|
||||
{ motorconnectorsopen, {GLFW_KEY_L, ""} },
|
||||
// motorconnectorsclose,
|
||||
{ user_command::motordisconnect, {GLFW_KEY_E | keymodifier::control, ""} },
|
||||
{ user_command::interiorlighttoggle, {GLFW_KEY_APOSTROPHE, ""} },
|
||||
{ motordisconnect, {GLFW_KEY_E | keymodifier::control, ""} },
|
||||
{ interiorlighttoggle, {GLFW_KEY_APOSTROPHE, ""} },
|
||||
// interiorlightenable,
|
||||
// interiorlightdisable,
|
||||
{ user_command::interiorlightdimtoggle, {GLFW_KEY_APOSTROPHE | keymodifier::control, ""} },
|
||||
{ interiorlightdimtoggle, {GLFW_KEY_APOSTROPHE | keymodifier::control, ""} },
|
||||
// interiorlightdimenable,
|
||||
// interiorlightdimdisable,
|
||||
// compartmentlightstoggle,
|
||||
// compartmentlightsenable,
|
||||
// compartmentlightsdisable,
|
||||
{ user_command::instrumentlighttoggle, {GLFW_KEY_SEMICOLON, ""} },
|
||||
{ instrumentlighttoggle, {GLFW_KEY_SEMICOLON, ""} },
|
||||
// instrumentlightenable,
|
||||
// instrumentlightdisable,
|
||||
{ user_command::dashboardlighttoggle, {GLFW_KEY_SEMICOLON | keymodifier::shift, ""} },
|
||||
{ dashboardlighttoggle, {GLFW_KEY_SEMICOLON | keymodifier::shift, ""} },
|
||||
// dashboardlightenable
|
||||
// dashboardlightdisable
|
||||
{ user_command::timetablelighttoggle, {GLFW_KEY_APOSTROPHE | keymodifier::shift, ""} },
|
||||
{ timetablelighttoggle, {GLFW_KEY_APOSTROPHE | keymodifier::shift, ""} },
|
||||
// timetablelightenable
|
||||
// timetablelightdisable
|
||||
{ user_command::generictoggle0, {GLFW_KEY_0, ""} },
|
||||
{ user_command::generictoggle1, {GLFW_KEY_1, ""} },
|
||||
{ user_command::generictoggle2, {GLFW_KEY_2, ""} },
|
||||
{ user_command::generictoggle3, {GLFW_KEY_3, ""} },
|
||||
{ user_command::generictoggle4, {GLFW_KEY_4, ""} },
|
||||
{ user_command::generictoggle5, {GLFW_KEY_5, ""} },
|
||||
{ user_command::generictoggle6, {GLFW_KEY_6, ""} },
|
||||
{ user_command::generictoggle7, {GLFW_KEY_7, ""} },
|
||||
{ user_command::generictoggle8, {GLFW_KEY_8, ""} },
|
||||
{ user_command::generictoggle9, {GLFW_KEY_9, ""} },
|
||||
{ user_command::batterytoggle, {GLFW_KEY_J, ""} },
|
||||
{ generictoggle0, {GLFW_KEY_0, ""} },
|
||||
{ generictoggle1, {GLFW_KEY_1, ""} },
|
||||
{ generictoggle2, {GLFW_KEY_2, ""} },
|
||||
{ generictoggle3, {GLFW_KEY_3, ""} },
|
||||
{ generictoggle4, {GLFW_KEY_4, ""} },
|
||||
{ generictoggle5, {GLFW_KEY_5, ""} },
|
||||
{ generictoggle6, {GLFW_KEY_6, ""} },
|
||||
{ generictoggle7, {GLFW_KEY_7, ""} },
|
||||
{ generictoggle8, {GLFW_KEY_8, ""} },
|
||||
{ generictoggle9, {GLFW_KEY_9, ""} },
|
||||
{ batterytoggle, {GLFW_KEY_J, ""} },
|
||||
// batteryenable,
|
||||
// batterydisable,
|
||||
// cabactivationtoggle,
|
||||
// cabactivationenable,
|
||||
// cabactivationdisable,
|
||||
{ user_command::motorblowerstogglefront, {GLFW_KEY_N | keymodifier::shift, ""} },
|
||||
{ user_command::motorblowerstogglerear, {GLFW_KEY_M | keymodifier::shift, ""} },
|
||||
{ user_command::motorblowersdisableall, {GLFW_KEY_M | keymodifier::control, ""} },
|
||||
{ motorblowerstogglefront, {GLFW_KEY_N | keymodifier::shift, ""} },
|
||||
{ motorblowerstogglerear, {GLFW_KEY_M | keymodifier::shift, ""} },
|
||||
{ motorblowersdisableall, {GLFW_KEY_M | keymodifier::control, ""} },
|
||||
// coolingfanstoggle,
|
||||
// tempomattoggle,
|
||||
// springbraketoggle,
|
||||
@@ -317,14 +318,14 @@ driverkeyboard_input::default_bindings() {
|
||||
// speedcontrolbutton8,
|
||||
// speedcontrolbutton9,
|
||||
// admin_timejump,
|
||||
{ user_command::timejumplarge, {GLFW_KEY_F1 | keymodifier::control, "Big time jump (Debug Mode only)"} },
|
||||
{ user_command::timejumpsmall, {GLFW_KEY_F1 | keymodifier::shift, "Small time jump (Debug Mode only)"} },
|
||||
{ timejumplarge, {GLFW_KEY_F1 | keymodifier::control, "Big time jump (Debug Mode only)"} },
|
||||
{ timejumpsmall, {GLFW_KEY_F1 | keymodifier::shift, "Small time jump (Debug Mode only)"} },
|
||||
// admin_vehiclemove,
|
||||
{ user_command::vehiclemoveforwards, {GLFW_KEY_LEFT_BRACKET | keymodifier::control, "Move the train forwards (Debug Mode only)"} },
|
||||
{ user_command::vehiclemovebackwards, {GLFW_KEY_RIGHT_BRACKET | keymodifier::control, "Move the train backwards (Debug Mode only)"} },
|
||||
{ user_command::vehicleboost, {GLFW_KEY_TAB | keymodifier::control, "Boost the train (Debug Mode only)"} },
|
||||
{ user_command::debugtoggle, {GLFW_KEY_F12 | keymodifier::control | keymodifier::shift, "Toggle Debug Mode"} },
|
||||
{ user_command::pausetoggle, {GLFW_KEY_ESCAPE, "Pause the game"} }
|
||||
{ vehiclemoveforwards, {GLFW_KEY_LEFT_BRACKET | keymodifier::control, "Move the train forwards (Debug Mode only)"} },
|
||||
{ vehiclemovebackwards, {GLFW_KEY_RIGHT_BRACKET | keymodifier::control, "Move the train backwards (Debug Mode only)"} },
|
||||
{ vehicleboost, {GLFW_KEY_TAB | keymodifier::control, "Boost the train (Debug Mode only)"} },
|
||||
{ debugtoggle, {GLFW_KEY_F12 | keymodifier::control | keymodifier::shift, "Toggle Debug Mode"} },
|
||||
{ pausetoggle, {GLFW_KEY_ESCAPE, "Pause the game"} }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user