Skip to content

Commit 5bf4f0b

Browse files
committed
added hotkey for ability meter
1 parent 9fcc9b4 commit 5bf4f0b

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

HCMInternal/GUIElementConstructor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,8 @@ class GUIElementConstructor::GUIElementConstructorImpl {
792792
createNestedElement(GUIElementEnum::triggerOverlaySettings),
793793
createNestedElement(GUIElementEnum::softCeilingOverlayToggle),
794794
createNestedElement(GUIElementEnum::softCeilingOverlaySettings),
795-
createNestedElement(GUIElementEnum::shieldInputPrinterToggle),
796-
createNestedElement(GUIElementEnum::sensDriftDetectorToggle),
795+
//createNestedElement(GUIElementEnum::shieldInputPrinterToggle),
796+
//createNestedElement(GUIElementEnum::sensDriftDetectorToggle),
797797
createNestedElement(GUIElementEnum::abilityMeterOverlayToggle),
798798
createNestedElement(GUIElementEnum::abilityMeterOverlaySettings),
799799
}));
@@ -1310,7 +1310,7 @@ class GUIElementConstructor::GUIElementConstructorImpl {
13101310

13111311
case GUIElementEnum::abilityMeterOverlayToggle:
13121312
return std::optional<std::shared_ptr<IGUIElement>>(std::make_shared<GUISimpleToggle<true>>
1313-
(game, ToolTipCollection("Renders an overlay with info about the player ability ability"), std::nullopt, "Ability Meter Toggle", settings->abilityMeterOverlayToggle));
1313+
(game, ToolTipCollection("Renders an overlay with info about the player ability ability"), RebindableHotkeyEnum::abilityMeterToggleHotkey, "Ability Meter Toggle", settings->abilityMeterOverlayToggle));
13141314
// TODO: add hotkey
13151315

13161316
case GUIElementEnum::abilityMeterOverlaySettings:

HCMInternal/HotkeyDefinitions.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,17 @@ class HotkeyDefinitions {
257257
mSettings->switchBSPSetLoadSetEvent,
258258
vsk{}),
259259

260-
260+
261261

262262

263263
initEventOnPressHotkey(hideHUDToggle,
264264
mSettings->hideHUDToggleHotkeyEvent,
265265
vsk{}),
266266

267+
initEventOnPressHotkey(abilityMeterToggleHotkey,
268+
mSettings->abilityMeterToggleHotkeyEvent,
269+
vsk{}),
270+
267271

268272
initEventOnPressHotkey_ignoreDisabler(commandConsoleHotkey,
269273
mSettings->commandConsoleHotkeyEvent,

HCMInternal/HotkeyEventsLambdas.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class HotkeyEventsLambdas
2626
ScopedCallback<ActionEvent> mtriggerOverlayToggleHotkeyEventCallbackHangle;
2727
ScopedCallback<ActionEvent> mdisableBarriersHotkeyEventCallbackHangle;
2828
ScopedCallback<ActionEvent> msoftCeilingOverlayToggleHotkeyEventCallbackHandle;
29+
ScopedCallback<ActionEvent> mabilityMeterToggleHotkeyEventCallbackHandle;
2930

3031
public:
3132
HotkeyEventsLambdas(std::shared_ptr< SettingsStateAndEvents> settings)
@@ -47,7 +48,8 @@ class HotkeyEventsLambdas
4748
mtoggleWaypoint3DHotkeyEventCallbackHandle(settings->toggleWaypoint3DHotkeyEvent, [boolsetting = settings->waypoint3DToggle]() { boolsetting->flipBoolSetting(); }),
4849
mtriggerOverlayToggleHotkeyEventCallbackHangle(settings->triggerOverlayToggleHotkeyEvent, [boolsetting = settings->triggerOverlayToggle]() {boolsetting->flipBoolSetting(); }),
4950
mdisableBarriersHotkeyEventCallbackHangle(settings->disableBarriersHotkeyEvent, [boolsettings = settings->disableBarriersToggle]() {boolsettings->flipBoolSetting(); }),
50-
msoftCeilingOverlayToggleHotkeyEventCallbackHandle(settings->softCeilingOverlayToggleHotkeyEvent, [boolsetting = settings->softCeilingOverlayToggle]() {boolsetting->flipBoolSetting(); })
51+
msoftCeilingOverlayToggleHotkeyEventCallbackHandle(settings->softCeilingOverlayToggleHotkeyEvent, [boolsetting = settings->softCeilingOverlayToggle]() {boolsetting->flipBoolSetting(); }),
52+
mabilityMeterToggleHotkeyEventCallbackHandle(settings->abilityMeterToggleHotkeyEvent, [boolsetting = settings->abilityMeterOverlayToggle]() {boolsetting->flipBoolSetting(); })
5153

5254
{ PLOG_DEBUG << "HotkeyEvents con"; }
5355

HCMInternal/HotkeysEnum.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ triggerOverlayToggleHotkey,\
5252
commandConsoleHotkey,\
5353
commandConsoleExecuteBuffer,\
5454
disableBarriers,\
55-
softCeilingOverlayToggleHotkey
55+
softCeilingOverlayToggleHotkey,\
56+
abilityMeterToggleHotkey
5657

5758

5859

0 commit comments

Comments
 (0)