From 2e09a7aa4b87f50bfccf6d44a21bde795b9002df Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 19 Sep 2015 10:02:37 -0500 Subject: [PATCH 1/2] "cherrypick" PR #2496 (lockpick) --- addons/vehiclelock/functions/fnc_lockpick.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf index f4837c742b..5c0e04ee0b 100644 --- a/addons/vehiclelock/functions/fnc_lockpick.sqf +++ b/addons/vehiclelock/functions/fnc_lockpick.sqf @@ -43,7 +43,7 @@ if (_vehLockpickStrenth < 0) exitWith {false}; //Condition check for progressBar _condition = { params ["_args"]; - _args params ["_args", "_unit", "_veh"]; + _args params ["_unit", "_veh"]; ((_unit distance _veh) < 5) && {(speed _veh) < 0.1} }; From 79d985a64883e2ad3c97e0799267175a8661d773 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 19 Sep 2015 10:43:29 -0500 Subject: [PATCH 2/2] Fix XEH Warning Debug Wait 5 to let supMon run first, and only show visual error if actually missing pbo. --- addons/interact_menu/XEH_clientInit.sqf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index c1a5e63e71..119afe4294 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -107,7 +107,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; //Debug to help end users identify mods that break CBA's XEH -["SettingsInitialized", { +[{ private ["_badClassnames"]; _badClassnames = []; { @@ -122,7 +122,11 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; ACE_LOGINFO("All compile checks passed"); } else { ACE_LOGERROR_1("%1 Classnames failed compile check!!! (bad XEH / missing cba_enable_auto_xeh.pbo)", (count _badClassnames)); - ["ACE Interaction failed to compile for some units (try adding cba_enable_auto_xeh.pbo)"] call BIS_fnc_error; - }; -}] call EFUNC(common,addEventHandler); + //Only show visual error if they are actually missing the pbo: + #define SUPMON configFile>>"CfgSettings">>"CBA">>"XEH">>"supportMonitor" + if ((!isNumber(SUPMON)) || {getNumber(SUPMON) != 1}) then { + ["ACE Interaction failed to compile for some units (try adding cba_enable_auto_xeh.pbo)"] call BIS_fnc_error; + }; + }; +}, [], 5] call EFUNC(common,waitAndExecute); //ensure CBASupMon has time to run first