From d00e7a17a18f3c672b77c300348595e56157bac7 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Tue, 23 Feb 2021 18:42:15 +0100 Subject: [PATCH] cookOff - Fix: Disable ammunition cookoff and turret effect when skipping destruction effects (#8122) * Disable ammunition cookoff and turret effect when skiping destruction effects * Improve readability --- addons/cookoff/XEH_postInit.sqf | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf index 94fe8899de..f714a4c2f3 100644 --- a/addons/cookoff/XEH_postInit.sqf +++ b/addons/cookoff/XEH_postInit.sqf @@ -73,8 +73,11 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace; // secondary explosions ["AllVehicles", "killed", { - params ["_vehicle"]; - if (_vehicle getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then { + params ["_vehicle", "", "", "_useEffects"]; + if ( + _useEffects && + _vehicle getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)] + ) then { if (GVAR(ammoCookoffDuration) == 0) exitWith {}; ([_vehicle] call FUNC(getVehicleAmmo)) params ["_mags", "_total"]; [_vehicle, _mags, _total] call FUNC(detonateAmmunition); @@ -83,9 +86,13 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace; // blow off turret effect ["Tank", "killed", { - if ((_this select 0) getVariable [QGVAR(enable), GVAR(enable)] in [1, 2, true]) then { + params ["_vehicle", "", "", "_useEffects"]; + if ( + _useEffects && + _vehicle getVariable [QGVAR(enable), GVAR(enable)] in [1, 2, true] + ) then { if (random 1 < 0.15) then { - (_this select 0) call FUNC(blowOffTurret); + _vehicle call FUNC(blowOffTurret); }; }; }] call CBA_fnc_addClassEventHandler;