From 7d71d85ffc6e9232c1a36e5592af1291a0e5a7d8 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Mon, 18 May 2015 22:49:47 +0100 Subject: [PATCH] Death to tabs --- addons/zeus/functions/fnc_moduleCapture.sqf | 34 +++++++-------- addons/zeus/functions/fnc_moduleKnockout.sqf | 34 +++++++-------- addons/zeus/functions/fnc_moduleSurrender.sqf | 42 +++++++++---------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/addons/zeus/functions/fnc_moduleCapture.sqf b/addons/zeus/functions/fnc_moduleCapture.sqf index f7f7a33e77..8d3a83e6c9 100644 --- a/addons/zeus/functions/fnc_moduleCapture.sqf +++ b/addons/zeus/functions/fnc_moduleCapture.sqf @@ -21,25 +21,25 @@ private ["_unit","_captive"]; if (!_activated) exitWith {}; if (isNil QEFUNC(captives,setHandcuffed)) then { - ["Requires ACE_Captives"] call DEFUNC(common,displayTextStructured); + ["Requires ACE_Captives"] call EFUNC(common,displayTextStructured); } else { - _unit = attachedTo _logic; + _unit = attachedTo _logic; - if (isNull _unit) then { - ["Place on a unit"] call DEFUNC(common,displayTextStructured); - } else { - if !(_unit isKindOf "CAManBase") then { - ["Unit must be infantry"] call DEFUNC(common,displayTextStructured); - } else { - if !(alive _unit) then { - ["Unit must be alive"] call DEFUNC(common,displayTextStructured); - } else { - _captive = GETVAR(_unit,EGVAR(captives,isHandcuffed),false); - // Event initalized by ACE_Captives - ["SetHandcuffed", _unit, [_unit, !_captive]] call DEFUNC(common,targetEvent); - }; - }; - }; + if (isNull _unit) then { + ["Place on a unit"] call EFUNC(common,displayTextStructured); + } else { + if !(_unit isKindOf "CAManBase") then { + ["Unit must be infantry"] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + ["Unit must be alive"] call EFUNC(common,displayTextStructured); + } else { + _captive = GETVAR(_unit,EGVAR(captives,isHandcuffed),false); + // Event initalized by ACE_Captives + ["SetHandcuffed", _unit, [_unit, !_captive]] call EFUNC(common,targetEvent); + }; + }; + }; }; deleteVehicle _logic; diff --git a/addons/zeus/functions/fnc_moduleKnockout.sqf b/addons/zeus/functions/fnc_moduleKnockout.sqf index 5f416cb771..19fb1574a2 100644 --- a/addons/zeus/functions/fnc_moduleKnockout.sqf +++ b/addons/zeus/functions/fnc_moduleKnockout.sqf @@ -21,25 +21,25 @@ private ["_unit","_conscious"]; if (!_activated) exitWith {}; if (isNil QEFUNC(medical,setUnconscious)) then { - ["Requires ACE_Medical"] call DEFUNC(common,displayTextStructured); + ["Requires ACE_Medical"] call EFUNC(common,displayTextStructured); } else { - _unit = attachedTo _logic; + _unit = attachedTo _logic; - if (isNull _unit) then { - ["Place on a unit"] call DEFUNC(common,displayTextStructured); - } else { - if !(_unit isKindOf "CAManBase") then { - ["Unit must be infantry"] call DEFUNC(common,displayTextStructured); - } else { - if !(alive _unit) then { - ["Unit must be alive"] call DEFUNC(common,displayTextStructured); - } else { - _conscious = GETVAR(_unit,ACE_isUnconscious,false); - // Function handles locality for me - [_unit, !_conscious, round(random(10)+5), true] call DEFUNC(medical,setUnconscious); - }; - }; - }; + if (isNull _unit) then { + ["Place on a unit"] call EFUNC(common,displayTextStructured); + } else { + if !(_unit isKindOf "CAManBase") then { + ["Unit must be infantry"] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + ["Unit must be alive"] call EFUNC(common,displayTextStructured); + } else { + _conscious = GETVAR(_unit,ACE_isUnconscious,false); + // Function handles locality for me + [_unit, !_conscious, round(random(10)+5), true] call EFUNC(medical,setUnconscious); + }; + }; + }; }; deleteVehicle _logic; diff --git a/addons/zeus/functions/fnc_moduleSurrender.sqf b/addons/zeus/functions/fnc_moduleSurrender.sqf index a2031b5f5d..0a5d3e9f3d 100644 --- a/addons/zeus/functions/fnc_moduleSurrender.sqf +++ b/addons/zeus/functions/fnc_moduleSurrender.sqf @@ -21,29 +21,29 @@ private ["_unit","_surrendering"]; if (!_activated) exitWith {}; if (isNil QEFUNC(captives,setSurrendered)) then { - ["Requires ACE_Captives"] call DEFUNC(common,displayTextStructured); + ["Requires ACE_Captives"] call EFUNC(common,displayTextStructured); } else { - _unit = attachedTo _logic; + _unit = attachedTo _logic; - if (isNull _unit) then { - ["Place on a unit"] call DEFUNC(common,displayTextStructured); - } else { - if !(_unit isKindOf "CAManBase") then { - ["Unit must be infantry"] call DEFUNC(common,displayTextStructured); - } else { - if !(alive _unit) then { - ["Unit must be alive"] call DEFUNC(common,displayTextStructured); - } else { - if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then { - ["Unit is a captive"] call DEFUNC(common,displayTextStructured); - } else { - _surrendering = GETVAR(_unit,EGVAR(captives,isSurrendering),false); - // Event initalized by ACE_Captives - ["SetSurrendered", _unit, [_unit, !_surrendering]] call DEFUNC(common,targetEvent); - }; - }; - }; - }; + if (isNull _unit) then { + ["Place on a unit"] call EFUNC(common,displayTextStructured); + } else { + if !(_unit isKindOf "CAManBase") then { + ["Unit must be infantry"] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + ["Unit must be alive"] call EFUNC(common,displayTextStructured); + } else { + if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then { + ["Unit is a captive"] call EFUNC(common,displayTextStructured); + } else { + _surrendering = GETVAR(_unit,EGVAR(captives,isSurrendering),false); + // Event initalized by ACE_Captives + ["SetSurrendered", _unit, [_unit, !_surrendering]] call EFUNC(common,targetEvent); + }; + }; + }; + }; }; deleteVehicle _logic;