Merge pull request #4185 from acemod/cleanup-deprecated

remove deprecated functions

addons/common/CfgEventHandlers.hpp

@@ -26,11 +26,6 @@ class Extended_DisplayLoad_EventHandlers {
 };
 
 class Extended_InitPost_EventHandlers {
-    class All {
-        class GVAR(executePersistent) {
-            init = QUOTE([_this select 0] call FUNC(executePersistent));
-        };
-    };
     class CAManBase {
         class GVAR(setName) {
             init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call CBA_fnc_execNextFrame};);

addons/common/XEH_PREP.hpp

@@ -39,27 +39,20 @@ PREP(endRadioTransmission);
 PREP(eraseCache);
 PREP(errorMessage);
 PREP(execNextFrame);
-PREP(execPersistentFnc);
-PREP(execRemoteFnc);
-PREP(executePersistent);
-PREP(filter);
 PREP(findUnloadPosition);
 PREP(firedEH);
 PREP(fixCollision);
 PREP(fixFloating);
 PREP(fixLoweredRifleAnimation);
 PREP(fixPosition);
 PREP(getAllDefinedSetVariables);
-PREP(getAllGear);
 PREP(getDeathAnim);
-PREP(getCaptivityStatus);
 PREP(getDefaultAnim);
 PREP(getDefinedVariable);
 PREP(getDefinedVariableDefault);
 PREP(getDefinedVariableInfo);
 PREP(getFirstObjectIntersection);
 PREP(getFirstTerrainIntersection);
-PREP(getForceWalkStatus);
 PREP(getGunner);
 PREP(getInPosition);
 PREP(getMapData);
@@ -114,7 +107,6 @@ PREP(loadPersonLocal);
 PREP(loadSettingsFromProfile);
 PREP(loadSettingsOnServer);
 PREP(loadSettingsLocalizedText);
-PREP(map);
 PREP(moduleCheckPBOs);
 PREP(moduleLSDVehicles);
 PREP(muteUnit);
@@ -143,12 +135,9 @@ PREP(runAfterSettingsInit);
 PREP(sanitizeString);
 PREP(sendRequest);
 PREP(serverLog);
-PREP(setAllGear);
 PREP(setApproximateVariablePublic);
-PREP(setCaptivityStatus);
 PREP(setDefinedVariable);
 PREP(setDisableUserInputStatus);
-PREP(setForceWalkStatus);
 PREP(setHearingCapability);
 PREP(setName);
 PREP(setParameter);
@@ -212,7 +201,6 @@ PREP(getVehicleCrew);
 PREP(getVehicleUAVCrew);
 
 // turrets
-PREP(getTurrets);
 PREP(getTurretIndex);
 PREP(getTurretConfigPath);
 PREP(getTurretGunner);

addons/common/XEH_postInit.sqf

@@ -160,14 +160,6 @@ if (isServer) then {
     [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
 };
 
-// @todo deprecated
-QGVAR(remoteFnc) addPublicVariableEventHandler {
-    (_this select 1) call FUNC(execRemoteFnc);
-};
-
-// @todo figure out what this does.
-[missionNamespace] call FUNC(executePersistent);
-
 
 //////////////////////////////////////////////////
 // Check files, previous installed version etc.
@@ -326,7 +318,37 @@ enableCamShake true;
 
 // "playerInventoryChanged" event
 ["loadout", {
-    ["ace_playerInventoryChanged", [ACE_player, [ACE_player, false] call FUNC(getAllGear)]] call CBA_fnc_localEvent;
+    private _fnc_getAllGear = {
+        if (isNull _this) exitWith {[
+            "",
+            "",
+            "", [],
+            "", [],
+            "", [],
+            "", ["","","",""], [],
+            "", ["","","",""], [],
+            "", ["","","",""], [],
+            [],
+            "",
+            ""
+        ]};
+
+        [
+            headgear _this,
+            goggles _this,
+            uniform _this, uniformItems _this,
+            vest _this, vestItems _this,
+            backpack _this, backpackItems _this,
+            primaryWeapon _this, primaryWeaponItems _this, primaryWeaponMagazine _this,
+            secondaryWeapon _this, secondaryWeaponItems _this, secondaryWeaponMagazine _this,
+            handgunWeapon _this, handgunItems _this, handgunMagazine _this,
+            assignedItems _this,
+            binocular _this,
+            _this call CBA_fnc_binocularMagazine
+        ]
+    };
+
+    ["ace_playerInventoryChanged", [ACE_player, ACE_player call _fnc_getAllGear]] call CBA_fnc_localEvent;
 }] call CBA_fnc_addPlayerEventHandler;
 
 // "playerVisionModeChanged" event

addons/common/XEH_preInit.sqf

@@ -5,17 +5,6 @@ ADDON = false;
 
 #include "XEH_PREP.hpp"
 
-// backwards comp
-DFUNC(canUseWeapon) = {
-    ACE_DEPRECATED("ace_common_fnc_canUseWeapon","3.7.0","CBA_fnc_canUseWeapon");
-    _this call CBA_fnc_canUseWeapon;
-};
-
-DFUNC(selectWeaponMode) = {
-    ACE_DEPRECATED("ace_common_fnc_selectWeaponMode","3.7.0","CBA_fnc_selectWeapon");
-    _this call CBA_fnc_selectWeapon;
-};
-
 GVAR(syncedEvents) = [] call CBA_fnc_hashCreate;
 GVAR(showHudHash) = [] call CBA_fnc_hashCreate;