From a37a33d4cd0ec024981061aaf2916bd4eef965d8 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 17 Feb 2023 09:53:11 -0500 Subject: [PATCH] keyDown eh --- addons/editor/functions/fnc_handleKeyDown.sqf | 6 ++++++ addons/editor/initKeybinds.sqf | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/editor/functions/fnc_handleKeyDown.sqf b/addons/editor/functions/fnc_handleKeyDown.sqf index 529d54e4c..78290aec5 100644 --- a/addons/editor/functions/fnc_handleKeyDown.sqf +++ b/addons/editor/functions/fnc_handleKeyDown.sqf @@ -18,6 +18,12 @@ params ["_display", "_keyCode"]; +if (GVAR(moveCamToSelection) > 0 && {_keyCode in actionKeys "curatorMoveCamTo" && {count SELECTED_OBJECTS > 0}}) exitWith { + [] call FUNC(moveCamToSelection); + + true +}; + // One frame later so RscDisplayCurator_sections is updated [{ params ["_display", "_keyCode", "_oldMode"]; diff --git a/addons/editor/initKeybinds.sqf b/addons/editor/initKeybinds.sqf index ec7970a50..c0ad0c57e 100644 --- a/addons/editor/initKeybinds.sqf +++ b/addons/editor/initKeybinds.sqf @@ -75,12 +75,6 @@ }; }, {}, [DIK_F, [false, true, true]]] call CBA_fnc_addKeybind; // Default: CTRL + ALT + F -[ELSTRING(main,DisplayName), QGVAR(curatorMoveCamTo), ["str_usract_curator_move_cam", "str_controls_tooltips_curator_move_cam"], { - if (!isNull curatorCamera) then { - [] call FUNC(handleCuratorMoveCamTo) - }; -}, {}, [DIK_F, [false, false, false]]] call CBA_fnc_addKeybind; // Default: F - [ELSTRING(main,DisplayName), QGVAR(orientTerrainNormal), ["str_3den_display3den_entitymenu_setatl_text", LSTRING(OrientTerrainNormal_Description)], { if (!isNull curatorCamera && {!GETMVAR(RscDisplayCurator_search,false)}) then { {