Skip to content

Commit fd0ee34

Browse files
Add vanilla keybinding conflict warning
1 parent e16e649 commit fd0ee34

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

addons/main/keybinding.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
class CfgUserActions {
22
class GVAR(action) {
33
displayName = CSTRING(Keybind_AIOAction);
4-
tooltip = "";
4+
tooltip = CSTRING(keybindWarning);
55
onActivate = QUOTE(call KEY_CODE(action));
66
onDeactivate = "";
77
onAnalog = "";
88
};
99
class GVAR(climb) {
1010
displayName = CSTRING(Keybind_ClimbDropOnly);
11-
tooltip = "";
11+
tooltip = CSTRING(keybindWarning);
1212
onActivate = QUOTE(call KEY_CODE(climb));
1313
onDeactivate = "";
1414
onAnalog = "";
1515
};
1616
class GVAR(jump) {
1717
displayName = CSTRING(Keybind_JumpOnly);
18-
tooltip = "";
18+
tooltip = CSTRING(keybindWarning);
1919
onActivate = QUOTE(call KEY_CODE(jump));
2020
onDeactivate = "";
2121
onAnalog = "";
2222
};
2323
class GVAR(assist) {
2424
displayName = CSTRING(Keybind_Assist);
25-
tooltip = "";
25+
tooltip = CSTRING(keybindWarning);
2626
onActivate = QUOTE(call KEY_CODE(assist));
2727
onDeactivate = "";
2828
onAnalog = "";
2929
};
3030
class GVAR(holster) {
3131
displayName = CSTRING(Keybind_HolsterWeapon);
32-
tooltip = "";
32+
tooltip = CSTRING(keybindWarning);
3333
onActivate = QUOTE(call KEY_CODE(holster));
3434
onDeactivate = "";
3535
onAnalog = "";
3636
};
3737
class GVAR(interact) {
3838
displayName = CSTRING(Keybind_Interact);
39-
tooltip = "";
39+
tooltip = CSTRING(keybindWarning);
4040
onActivate = QUOTE(call KEY_CODE(interact));
4141
onDeactivate = "";
4242
onAnalog = "";

addons/main/stringtable.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,5 +431,8 @@
431431
<Key ID="STR_EMR_Main_interactBehaviorInVehicle_Engine">
432432
<English>Toggle engine (must be driver)</English>
433433
</Key>
434+
<Key ID="STR_EMR_Main_keybindWarning">
435+
<English>Ensure you have no conflicts with default CBA keybinds (Configure Addons)</English>
436+
</Key>
434437
</Package>
435438
</Project>

0 commit comments

Comments
 (0)