Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix

Explosive fix attach delete vehicle fix

addons/explosives/XEH_postInit.sqf

@@ -37,7 +37,7 @@ player addEventHandler ["Killed", {
     } count _deadman;
 }];
 player addEventHandler ["Take", {
-    private ["_item", "_getter", "_giver", "_config"];
+    private ["_item", "_getter", "_giver", "_config", "_detonators"];
     _item = _this select 2;
     _getter = _this select 0;
     _giver = _this select 1;

addons/explosives/functions/fnc_addCellphoneIED.sqf

@@ -17,7 +17,11 @@
  * Public: No
  */
 #include "script_component.hpp"
+
 EXPLODE_4_PVT(_this,_unit,_explosive,_magazineClass,_extra);
+
+private["_config", "_detonators", "_hasRequired", "_requiredItems", "_code", "_count", "_codeSet"];
+
 // Config is the last item in the list of passed in items.
 _config = (_this select 3) select (count (_this select 3) - 1);
 
@@ -29,7 +33,7 @@ _detonators = [_unit] call FUNC(getDetonators);
         _hasRequired = false;
     };
 } count _requiredItems;
-private ["_code", "_count", "_codeSet"];
+
 _codeSet = false;
 while {!_codeSet} do {
     _code = str(round (random 9999));

addons/explosives/functions/fnc_addClacker.sqf

@@ -17,7 +17,7 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private ["_clacker", "_config", "_requiredItems", "_hasRequired"];
+private ["_clacker", "_config", "_requiredItems", "_hasRequired", "_detonators"];
 EXPLODE_3_PVT(_this,_unit,_explosive,_magazineClass);
 // Config is the last item in the list of passed in items.
 _config = (_this select 3) select (count (_this select 3) - 1);

addons/explosives/functions/fnc_addDetonateActions.sqf

@@ -15,7 +15,7 @@
  * Public: No
  */
 #include "script_component.hpp"
-private ["_result", "_item", "_children"];
+private ["_result", "_item", "_children", "_range", "_required"];
 
 EXPLODE_2_PVT(_this,_unit,_detonator);
 _range = GetNumber (ConfigFile >> "CfgWeapons" >> _detonator >> "ACE_Range");

addons/explosives/functions/fnc_addExplosiveActions.sqf

@@ -11,7 +11,7 @@
  * Public: No
  */
 #include "script_component.hpp"
-private ["_mags", "_item", "_index", "_children"];
+private ["_mags", "_item", "_index", "_children", "_itemCount", "_list"];
 
 EXPLODE_1_PVT(_this,_unit);
 

addons/explosives/functions/fnc_addTransmitterActions.sqf

@@ -14,7 +14,7 @@
  * Public: No
  */
 #include "script_component.hpp"
-private ["_items", "_unit", "_children", "_config"];
+private ["_unit", "_children", "_config", "_detonators"];
 _unit = _this select 0;
 _detonators = [_unit] call FUNC(getDetonators);
 _children = [];

addons/explosives/functions/fnc_addTriggerActions.sqf

@@ -15,8 +15,7 @@
  * Public: No
  */
 #include "script_component.hpp"
-private ["_hasRequiredItems","_triggerTypes", "_children",
-    "_detonators", "_required", "_magTriggers"];
+private ["_hasRequiredItems","_triggerTypes", "_children", "_detonators", "_required", "_magTriggers"];
 EXPLODE_2_PVT(_this,_magazine,_explosive);
 _detonators = [ACE_player] call FUNC(getDetonators);
 

addons/explosives/functions/fnc_canDefuse.sqf

@@ -14,7 +14,7 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private ["_specialist"];
+private ["_isSpecialist"];
 EXPLODE_2_PVT(_this,_unit,_target);
 if (isNull(_target getVariable [QGVAR(Explosive),objNull])) exitWith {
     deleteVehicle _target;

addons/explosives/functions/fnc_detonateExplosive.sqf

@@ -19,18 +19,18 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private ["_result", "_ignoreRange", "_helper"];
+private ["_result", "_ignoreRange", "_helpers", "_pos"];
 EXPLODE_3_PVT(_this,_unit,_range,_item);
 _ignoreRange = (_range == -1);
 _result = true;
 
 if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false};
 
-_helper = (attachedTo (_item select 0));
-if (!isNull(_helper)) then {
-    detach (_item select 0);
-    deleteVehicle _helper;
-};
+_helpers = attachedObjects (_item select 0);
+{
+    detach _x;
+    deleteVehicle _x;  
+} forEach _helpers;
 
 if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
     private ["_exp", "_previousExp"];
@@ -46,10 +46,11 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhe
     };
 };
 [{
-        _explosive = _this;
-        if (!isNull _explosive) then {
-            _explosive setDamage 1;
-        };
+    private ["_explosive"];
+    _explosive = _this;
+    if (!isNull _explosive) then {
+        _explosive setDamage 1;
+    };
 }, _item select 0, _item select 1, 0] call EFUNC(common,waitAndExecute);
 
 _result

addons/explosives/functions/fnc_dialPhone.sqf

@@ -15,7 +15,7 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private ["_arr", "_ran", "_i","_speedDial"];
+private ["_arr", "_ran", "_i"];
 EXPLODE_2_PVT(_this,_unit,_code);
 if (_unit getVariable [QGVAR(Dialing),false]) exitWith {};
 if !(alive _unit) exitWith {};

addons/explosives/functions/fnc_getDetonators.sqf

@@ -14,6 +14,8 @@
  * Public: Yes
  */
 #include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_detonators);
+
 private ["_unit", "_items", "_result", "_config"];
 _unit = _this select 0;
 _items = (items _unit);

addons/explosives/functions/fnc_getPlacedExplosives.sqf

@@ -16,6 +16,8 @@
  * Public: Yes
  */
 #include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_allExplosives,_deadmanExplosives);
+
 private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"];
 _unit = _this select 0;
 _filter = nil;

addons/explosives/functions/fnc_hasExplosives.sqf

@@ -14,6 +14,8 @@
  * Public: Yes
  */
 #include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_hasExplosives);
+
 private ["_unit", "_result", "_magazines"];
 _result = false;
 _unit = _this select 0;

addons/explosives/functions/fnc_hasPlacedExplosives.sqf

@@ -14,4 +14,6 @@
  * Public: Yes
  */
 #include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_hasPlacedExplosives);
+
 (count (_this call FUNC(getPlacedExplosives)) > 0)

addons/explosives/functions/fnc_module.sqf

@@ -15,6 +15,9 @@
  */
 #include "script_component.hpp"
 if !(isServer) exitWith {};
+
+private["_activated", "_logic"];
+
 _logic = _this select 0;
 _activated = _this select 2;
 

addons/explosives/functions/fnc_onLanded.sqf

@@ -1,7 +1,10 @@
 /*
  * Author: Garth 'L-H' de Wet
+ * Handles the "EpeContactStart" event when placing the explosive.
  *
  * Arguments:
+ * 0: Explosive Placing Object <OBJECT>
+ * 1: Colliding  Object <OBJECT>
  *
  * Return Value:
  * None
@@ -14,19 +17,23 @@
 #include "script_component.hpp"
 EXPLODE_2_PVT(_this,_explosive,_hitTarget);
 
+TRACE_2("Explosive EpeContactStart",_explosive,_hitTarget);
+
 if ((_explosive getVariable [QGVAR(Handled), false])) exitWith {};
 
 _explosive setVariable [QGVAR(Handled), true];
 if (!isNull _hitTarget && {_hitTarget isKindOf "AllVehicles"}) then {
+    TRACE_1("Attaching to",_hitTarget);
     _explosive attachTo [_hitTarget];
     private "_dir";
-    _dir = _setup getVariable [QGVAR(Direction), 0];
+    _dir = _explosive getVariable [QGVAR(Direction), 0];
     _dir = _dir - (getDir _hitTarget);
     [[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);
 } else {
     [{
         EXPLODE_2_PVT(_this,_player,_explosive);
         private "_pos";
+        _pos = getPosASL _explosive;
         if (surfaceIsWater _pos) then {
             _pos = getPosASL _explosive;
             _explosive setPosASL _pos;

addons/explosives/functions/fnc_placeExplosive.sqf

@@ -21,10 +21,14 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private ["_ammo", "_explosive"];
+private ["_ammo", "_explosive", "_attachedTo", "_expPos", "_magazineTrigger"];
 EXPLODE_6_PVT(_this,_unit,_pos,_dir,_magazineClass,_triggerConfig,_triggerSpecificVars);
-if (count _this > 6) then {
-    deleteVehicle (_this select 6);
+DEFAULT_PARAM(6,_setupPlaceholderObject,objNull);
+
+_attachedTo = objNull;
+if (!isNull _setupPlaceholderObject) then {
+    _attachedTo = attachedTo _setupPlaceholderObject;
+    deleteVehicle _setupPlaceholderObject;
 };
 
 if (isNil "_triggerConfig") exitWith {
@@ -57,6 +61,11 @@ _expPos = getPosATL _explosive;
 _defuseHelper setPosATL (((getPosATL _defuseHelper) vectorAdd (_pos vectorDiff _expPos)));
 _explosive setPosATL _pos;
 
+if (!isNull _attachedTo) then {
+    TRACE_1("Attaching Live Explosive",_attachedTo);
+    _explosive attachTo [_attachedTo];
+};
+
 if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_triggerSpecificVars]
     call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive};
 [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);

addons/explosives/functions/fnc_place_Approve.sqf

@@ -19,7 +19,7 @@ if (GVAR(pfeh_running)) then {
     [QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler);
     GVAR(pfeh_running) = false;
 };
-private ["_mag", "_setup", "_player"];
+private ["_setup", "_player", "_dir"];
 _setup = GVAR(Setup);
 GVAR(Setup) = objNull;
 [GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus);

addons/explosives/functions/fnc_setupExplosive.sqf

@@ -28,7 +28,7 @@ GVAR(Setup) setVariable [QGVAR(class), _class, true];
 GVAR(TweakedAngle) = 180;
 
 [QGVAR(Placement),"OnEachFrame", {
-    private "_player";
+    private ["_player", "_pos"];
     _player = ACE_player;
     if (GVAR(placer) != _player) exitWith {
         call FUNC(place_Cancel);

addons/explosives/functions/fnc_startDefuse.sqf

@@ -16,11 +16,14 @@
  */
 #include "script_component.hpp"
 EXPLODE_2_PVT(_this,_unit,_target);
+
+private["_actionToPlay"];
+
 _target = attachedTo (_target);
 
 _fnc_DefuseTime = {
     EXPLODE_2_PVT(_this,_specialist,_target);
-
+    private ["_defuseTime"];
     _defuseTime = 5;
     if (isNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime")) then {
         _defuseTime = getNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime");

addons/explosives/functions/fnc_startTimer.sqf

@@ -19,6 +19,7 @@
 EXPLODE_2_PVT(_this,_explosive,_delay);
 
 [{
+    private ["_explosive"];
     _explosive = _this;
     if (!isNull _explosive) then {
         [_explosive, -1, [_explosive, 0]] call FUNC(detonateExplosive);

addons/explosives/functions/fnc_triggerType.sqf

@@ -14,7 +14,10 @@
  * Public: Yes
  */
 #include "script_component.hpp"
-private "_result";
+
+private["_result", "_config", "_count", "_index", "_supports"];
+// IGNORE_PRIVATE_WARNING(_supports);
+
 _result = [];
 _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers");
 _count = count _config;

addons/explosives/script_component.hpp

@@ -1,6 +1,8 @@
 #define COMPONENT explosives
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+
 #ifdef DEBUG_ENABLED_EXPLOSIVES
     #define DEBUG_MODE_FULL
 #endif