From c16c5e756cad248cf5a88b4022e9679b71fe0334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Wed, 14 Jan 2015 10:13:04 -0300 Subject: [PATCH] explosives: fixes --- addons/explosives/functions/fnc_placeExplosive.sqf | 4 ++-- addons/explosives/functions/fnc_place_Approve.sqf | 2 +- addons/explosives/functions/fnc_startDefuse.sqf | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index a0adef1241..f2198c6d0a 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -56,7 +56,7 @@ _explosive = createVehicle [_ammo, _pos, [], 0, "NONE"]; if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_triggerSpecificVars] call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive}; if (_setDir) then { - [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QUOTE(FUNC(setPosition))] - call EFUNC(Common,execRemoteFnc); + [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QFUNC(setPosition)] + call EFUNC(common,execRemoteFnc); }; _explosive diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf index f75d1a5fcc..97a7280718 100644 --- a/addons/explosives/functions/fnc_place_Approve.sqf +++ b/addons/explosives/functions/fnc_place_Approve.sqf @@ -73,7 +73,7 @@ if ((_setup getVariable [QGVAR(Class), ""]) != "") then { if (!isNull (_this select 1)) then { _explosive attachTo [(_this select 1)]; _dir = _dir - (getDir (_this select 1)); - [[_explosive, _dir, 0], QUOTE(FUNC(setPosition))] call EFUNC(Common,execRemoteFnc); + [[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc); }; }; }; diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 2270f6b56d..7908c3138c 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -41,7 +41,7 @@ if (STANCE _unit == "Prone") then { if (ACE_player != _unit) then { // If the unit is a player, call the function on the player. if (isPlayer _unit) then { - [[_unit, _target], QUOTE(FUNC(startDefuse)), _unit] call EFUNC(Common,execRemoteFnc); + [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { // TODO: use scheduled delay execution [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { @@ -59,10 +59,10 @@ if (ACE_player != _unit) then { if (GVAR(RequireSpecialist)) then { if ([_unit] call EFUNC(Common,isEOD)) then { [[true, _target] call _fnc_DefuseTime, [_unit,_target], - QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar); + QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(common,progressBar); }; } else { [[([_unit] call EFUNC(Common,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target], - QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar); + QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(common,progressBar); }; };