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

More Core Stuff

Browse Source
This commit is contained in:
PabstMirror 2015-01-12 05:25:34 -06:00
parent a9c20dcaf6
commit d59b33f697
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/core/XEH_postInit.sqf
View File

@ -48,9 +48,9 @@ call COMPILE_FILE2(scripts\KeyInput\initScrollWheel.sqf);
0 spawn { 0 spawn {
while {true} do { while {true} do {
waitUntil {!isNull (findDisplay 46)}; sleep 0.1; waitUntil {!isNull (findDisplay 46)}; sleep 0.1;
findDisplay 46 displayAddEventHandler ["KeyDown", QUOTE( _this call QUOTE(QGVAR(onKeyDown)) )]; findDisplay 46 displayAddEventHandler ["KeyDown", QUOTE( _this call GVAR(onKeyDown) )];
findDisplay 46 displayAddEventHandler ["KeyUp", QUOTE( _this call QUOTE(QGVAR(onKeyUp)) )]; findDisplay 46 displayAddEventHandler ["KeyUp", QUOTE( _this call GVAR(onKeyUp) )];
findDisplay 46 displayAddEventHandler ["MouseZChanged", QUOTE( _this call QUOTE(QGVAR(onScrollWheel)) )]; findDisplay 46 displayAddEventHandler ["MouseZChanged", QUOTE( _this call GVAR(onScrollWheel) )];
[false] call FUNC(disableUserInput); [false] call FUNC(disableUserInput);
waitUntil {isNull (findDisplay 46)}; waitUntil {isNull (findDisplay 46)};
}; };

2
addons/core/functions/fnc_progressBar.sqf
View File

@ -52,7 +52,7 @@ _this spawn {
if (time > _time) then { if (time > _time) then {
_arguments call _function; _arguments call _function;
} else { } else {
[localize QOUTE(DOUBLES(STR,GVAR(ActionAborted)))] call FUNC(displayTextStructured); [localize QUOTE(DOUBLES(STR,GVAR(ActionAborted)))] call FUNC(displayTextStructured);
if (!isNil "_function2") then { if (!isNil "_function2") then {
_progress = 1 - ((_time - time) / (_this select 0)) max 0 min 1; _progress = 1 - ((_time - time) / (_this select 0)) max 0 min 1;
_arguments call _function2; _arguments call _function2;