Merge pull request #3106 from acemod/explEvents

Explosive events, fix #3104
acemod · Feb 4, 2016 · e0946c3 · e0946c3
2 parents 35333cb + 977bda8
commit e0946c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/addons/explosives/functions/fnc_defuseExplosive.sqf b/addons/explosives/functions/fnc_defuseExplosive.sqf
@@ -22,6 +22,8 @@ TRACE_2("params",_unit,_explosive);
 if (GVAR(ExplodeOnDefuse) && {(random 1.0) < (getNumber (ConfigFile >> "CfgAmmo" >> typeOf _explosive >> "ACE_explodeOnDefuse"))}) exitWith {
     TRACE_1("exploding on defuse",_explosive);
     [_unit, -1, [_explosive, 1], true] call FUNC(detonateExplosive);
+    [QGVAR(explodeOnDefuse), [_explosive, _unit]] call EFUNC(common,globalEvent);
 };
 
 _unit action ["Deactivate", _unit, _explosive];
+[QGVAR(defuse), [_explosive, _unit]] call EFUNC(common,globalEvent);
diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf
@@ -94,7 +94,7 @@ if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_tr
 
 _pitch = getNumber (_magazineTrigger >> "pitch");
 
-//Globaly set the position angle:
-[QGVAR(place), [_explosive, _dir, _pitch]] call EFUNC(common,globalEvent);
+//Globaly set the position and angle:
+[QGVAR(place), [_explosive, _dir, _pitch, _unit]] call EFUNC(common,globalEvent);
 
 _explosive