Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2559 from acemod/340disableuserinputcleanup

Browse Source 
Use CBA PFH in disableUserInput
This commit is contained in:
commy2
2015-09-22 00:52:58 +02:00
parent 617b1ec78d 23e3db9cc0
commit 24f0df55a2
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
addons/common/functions/fnc_disableUserInput.sqf
View File

@ -44,11 +44,7 @@ if (_state) then {
private ["_dlg", "_ctrl"]; private ["_dlg", "_ctrl"];
_dlg = finddisplay 49; _dlg = findDisplay 49;
_dlg displayAddEventHandler ["KeyDown", {
params ["", "_key"];
!(_key == 1)
}];
for "_index" from 100 to 2000 do { for "_index" from 100 to 2000 do {
(_dlg displayCtrl _index) ctrlEnable false; (_dlg displayCtrl _index) ctrlEnable false;
@ -97,16 +93,17 @@ if (_state) then {
_dlg displayAddEventHandler ["KeyUp", {true}]; _dlg displayAddEventHandler ["KeyUp", {true}];
["ACE_DisableUserInput", "onEachFrame", { GVAR(disableInputPFH) = [{
if (isNull (uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull]) && {!visibleMap && isNull findDisplay 49 && isNull findDisplay 312 && isNull findDisplay 632}) then { if (isNull (uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull]) && {!visibleMap && isNull findDisplay 49 && isNull findDisplay 312 && isNull findDisplay 632}) then {
["ACE_DisableUserInput", "onEachFrame"] call BIS_fnc_removeStackedEventHandler; [GVAR(disableInputPFH)] call CBA_fnc_removePerFrameHandler;
GVAR(disableInputPFH) = nil;
[true] call FUNC(disableUserInput); [true] call FUNC(disableUserInput);
}; };
}] call BIS_fnc_addStackedEventHandler; }, 0, []] call CBA_fnc_addPerFrameHandler;
} else { } else {
if ("ACE_DisableUserInput" in ([BIS_stackedEventHandlers_onEachFrame, {_this select 0}] call FUNC(map))) then { if (!isNil QGVAR(disableInputPFH)) then {
["ACE_DisableUserInput", "onEachFrame"] call BIS_fnc_removeStackedEventHandler; [GVAR(disableInputPFH)] call CBA_fnc_removePerFrameHandler;
GVAR(disableInputPFH) = nil;
}; };
(uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull]) closeDisplay 0; (uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull]) closeDisplay 0;