diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp index 8a33997f57..e0c44a90ac 100644 --- a/addons/common/XEH_PREP.hpp +++ b/addons/common/XEH_PREP.hpp @@ -113,7 +113,6 @@ PREP(isMedic); PREP(isModLoaded); PREP(isPlayer); PREP(isSwimming); -PREP(isUnderwater); PREP(lightIntensityFromObject); PREP(loadPerson); PREP(loadPersonLocal); diff --git a/addons/common/functions/fnc_isUnderwater.sqf b/addons/common/functions/fnc_isUnderwater.sqf deleted file mode 100644 index 0d7d1e50a1..0000000000 --- a/addons/common/functions/fnc_isUnderwater.sqf +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Author: Glowbal - * Check if unit's head is underwater - * - * Arguments: - * 0: Unit - * - * Return Value: - * If unit's head is underwater - * - * Example: - * [bob] call ace_common_fnc_isUnderwater - * - * Public: Yes - */ -#include "script_component.hpp" - -ACE_DEPRECATED(QFUNC(isUnderwater),"3.13.0","underwater OBJECT"); - -params [["_unit", objNull, [objNull]]]; - -private _return = false; - -if (surfaceIsWater getPosASL _unit) then { - private _pos = _unit modelToWorldVisual (_unit selectionPosition "head"); - - if (_pos select 2 < 0) then { - _return = true; - }; -}; - -_return diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf index b2d55e1f7f..92726bb61e 100644 --- a/addons/refuel/XEH_postInit.sqf +++ b/addons/refuel/XEH_postInit.sqf @@ -67,11 +67,6 @@ private _sourceClasses = []; private _fuelCargo = getNumber (_x >> QGVAR(fuelCargo)); if (_fuelCargo > 0 || {_fuelCargo == REFUEL_INFINITE_FUEL}) then { private _sourceClass = configName _x; - if (isClass (_x >> "ACE_Actions" >> "ACE_MainActions" >> QGVAR(Refuel))) exitWith { - if (!isClass (inheritsFrom _x >> "ACE_Actions" >> "ACE_MainActions" >> QGVAR(Refuel))) then { - ACE_DEPRECATED(FORMAT_1(QUOTE(GVAR(Refuel) interaction menu in %1),_sourceClass),"3.13.0",QUOTE(GVAR(fuelCargo) config value)); - }; - }; // check if we can use actions with inheritance if ( !isText (_x >> "EventHandlers" >> "CBA_Extended_EventHandlers" >> "init") // addActionToClass relies on XEH init diff --git a/addons/spectator/functions/fnc_updateUnits.sqf b/addons/spectator/functions/fnc_updateUnits.sqf index 6df7cad8ad..85ad1739ff 100644 --- a/addons/spectator/functions/fnc_updateUnits.sqf +++ b/addons/spectator/functions/fnc_updateUnits.sqf @@ -20,16 +20,7 @@ // Function only matters on player clients if (!hasInterface) exitWith {}; -params [["_addUnits",[],[[]]], ["_removeUnits",[],[[], true]]]; - -// Deprecated parameter (remember to remove bool from params when removed) -if (_removeUnits isEqualType true) then { - ACE_DEPRECATED("Boolean parameter","3.12.0","array (see function header or doc)"); - if (_removeUnits) then { - _removeUnits = _addUnits; - _addUnits = []; - }; -}; +params [["_addUnits",[],[[]]], ["_removeUnits",[],[[]]]]; // Add to the whitelist and prevent list overlap GVAR(unitBlacklist) = GVAR(unitBlacklist) - _addUnits;