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 #2911 from acemod/checkPBOsNonSchedul

Browse Source 
Remove Sleep/WaitUntil from checkPBO
This commit is contained in:
commy2
2015-12-04 21:24:42 +01:00
parent 80463aff73 91ace4fc9b
commit 4d20615c29
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/XEH_postInit.sqf
View File

@ -167,7 +167,7 @@ call FUNC(checkFiles);
[ [
GVAR(checkPBOsAction), GVAR(checkPBOsAction),
GVAR(checkPBOsCheckAll), GVAR(checkPBOsCheckAll),
call compile GVAR(checkPBOsWhitelist) GVAR(checkPBOsWhitelist)
] call FUNC(checkPBOs) ] call FUNC(checkPBOs)
}] call FUNC(addEventHandler); }] call FUNC(addEventHandler);

26
addons/common/functions/fnc_checkPBOs.sqf
View File

@ -9,7 +9,7 @@
* 1 = Warn permanently * 1 = Warn permanently
* 2 = Kick * 2 = Kick
* 1: Check all PBOs? (default: false) <BOOL> * 1: Check all PBOs? (default: false) <BOOL>
* 2: Whitelist (default: "[]") <STRING> * 2: Whitelist (default: "") <STRING>
* *
* Return Value: * Return Value:
* None * None
@ -18,9 +18,13 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
params ["_mode", ["_checkAll", false], ["_whitelist", "[]"]]; params ["_mode", ["_checkAll", false], ["_whitelist", "", [""]]];
TRACE_3("params",_mode,_checkAll,_whitelist);
_whitelist = [_whitelist, {toLower _this}] call FUNC(map); //lowercase and convert whiteList String into array of strings:
_whitelist = toLower _whitelist;
_whitelist = _whitelist splitString "[,""']";
TRACE_1("Array",_whitelist);
ACE_Version_CheckAll = _checkAll; ACE_Version_CheckAll = _checkAll;
ACE_Version_Whitelist = _whitelist; ACE_Version_Whitelist = _whitelist;
@ -75,15 +79,21 @@ if (!isServer) then {
_ctrlHint ctrlSetStructuredText _text; _ctrlHint ctrlSetStructuredText _text;
if (_mode == 0) then { if (_mode == 0) then {
sleep 10; [{
_rscLayer cutFadeOut 0.2; params ["_rscLayer"];
TRACE_2("Hiding Error message after 10 seconds",time,_rscLayer);
_rscLayer cutFadeOut 0.2;
}, [_rscLayer], 10] call FUNC(waitAndExecute);
}; };
}; };
if (_mode == 2) then { if (_mode == 2) then {
waitUntil {alive player}; // To be able to show list if using checkAll [{alive player}, { // To be able to show list if using checkAll
_text = composeText [parseText format ["<t align='center'>%1</t>", _text]]; params ["_text"];
["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); TRACE_2("Player is alive, showing msg and exiting",time,_text);
_text = composeText [parseText format ["<t align='center'>%1</t>", _text]];
["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
}, [_text]] call FUNC(waitUntilAndExecute);
}; };
}; };