Clean up deprecated in 3.13

This commit is contained in:
Dystopian 2018-05-05 21:54:13 +03:00
parent d68f67a1ef
commit c35a53ba79
4 changed files with 1 additions and 48 deletions

View File

@ -113,7 +113,6 @@ PREP(isMedic);
PREP(isModLoaded); PREP(isModLoaded);
PREP(isPlayer); PREP(isPlayer);
PREP(isSwimming); PREP(isSwimming);
PREP(isUnderwater);
PREP(lightIntensityFromObject); PREP(lightIntensityFromObject);
PREP(loadPerson); PREP(loadPerson);
PREP(loadPersonLocal); PREP(loadPersonLocal);

View File

@ -1,32 +0,0 @@
/*
* Author: Glowbal
* Check if unit's head is underwater
*
* Arguments:
* 0: Unit <OBJECT>
*
* Return Value:
* If unit's head is underwater <BOOL>
*
* 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

View File

@ -67,11 +67,6 @@ private _sourceClasses = [];
private _fuelCargo = getNumber (_x >> QGVAR(fuelCargo)); private _fuelCargo = getNumber (_x >> QGVAR(fuelCargo));
if (_fuelCargo > 0 || {_fuelCargo == REFUEL_INFINITE_FUEL}) then { if (_fuelCargo > 0 || {_fuelCargo == REFUEL_INFINITE_FUEL}) then {
private _sourceClass = configName _x; 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 // check if we can use actions with inheritance
if ( if (
!isText (_x >> "EventHandlers" >> "CBA_Extended_EventHandlers" >> "init") // addActionToClass relies on XEH init !isText (_x >> "EventHandlers" >> "CBA_Extended_EventHandlers" >> "init") // addActionToClass relies on XEH init

View File

@ -20,16 +20,7 @@
// Function only matters on player clients // Function only matters on player clients
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
params [["_addUnits",[],[[]]], ["_removeUnits",[],[[], true]]]; params [["_addUnits",[],[[]]], ["_removeUnits",[],[[]]]];
// 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 = [];
};
};
// Add to the whitelist and prevent list overlap // Add to the whitelist and prevent list overlap
GVAR(unitBlacklist) = GVAR(unitBlacklist) - _addUnits; GVAR(unitBlacklist) = GVAR(unitBlacklist) - _addUnits;