Remove deprecated functionality for 3.12.0 (#5878)

* Remove deprecated functionality for 3.12.0 * Remove associated deprecated module icon * Restore a dummy version of old module This is just to prevent existing missions from breaking due to a missing object.
acemod · Dec 10, 2017 · 10760bd · 10760bd
1 parent a2e4dbb
commit 10760bd
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 335 deletions.
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
@@ -39,32 +39,9 @@ class CfgVehicles {
             sync[] = {};
         };
     };
-    class GVAR(makeLoadable): ACE_Module {
+    class GVAR(makeLoadable): Logic {
         scope = 1;
-        displayName = CSTRING(makeLoadable_displayName);
-        icon = QPATHTOF(UI\Icon_Module_makeLoadable_ca.paa);
-        category = "ACE_Logistics";
-        function = QFUNC(moduleMakeLoadable);
-        isGlobal = 1;
-        isTriggerActivated = 0;
-        author = ECSTRING(common,ACETeam);
-        class Arguments {
-            class canLoad {
-                displayName = CSTRING(makeLoadable_displayName);
-                description = CSTRING(MakeLoadable_description);
-                typeName = "BOOL";
-                defaultValue = 1;
-            };
-            class setSize {
-                displayName = CSTRING(makeLoadable_setSize_displayName);
-                typeName = "NUMBER";
-                defaultValue = 1;
-            };
-        };
-        class ModuleDescription: ModuleDescription {
-            description = CSTRING(makeLoadable_description);
-            sync[] = {"AnyStaticObject"};
-        };
+        displayName = "Delete (Deprecated in ACE3 3.12.0)";
     };
 
     class LandVehicle;

diff --git a/addons/cargo/UI/Icon_Module_makeLoadable_ca.paa b/addons/cargo/UI/Icon_Module_makeLoadable_ca.paa
diff --git a/addons/cargo/XEH_PREP.hpp b/addons/cargo/XEH_PREP.hpp
@@ -1,4 +1,3 @@
-
 PREP(addCargoItem);
 PREP(addCargoVehiclesActions);
 PREP(canLoadItemIn);
@@ -9,8 +8,6 @@ PREP(handleDestroyed);
 PREP(initObject);
 PREP(initVehicle);
 PREP(loadItem);
-PREP(makeLoadable);
-PREP(moduleMakeLoadable);
 PREP(moduleSettings);
 PREP(onMenuOpen);
 PREP(paradropItem);

diff --git a/addons/cargo/functions/fnc_makeLoadable.sqf b/addons/cargo/functions/fnc_makeLoadable.sqf
diff --git a/addons/cargo/functions/fnc_moduleMakeLoadable.sqf b/addons/cargo/functions/fnc_moduleMakeLoadable.sqf
diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Cargo">
         <Key ID="STR_ACE_Cargo_loadObject">
@@ -228,51 +228,6 @@
             <Chinese>%1&lt;br/&gt;無法被卸載</Chinese>
             <Chinesesimp>%1&lt;br/&gt;无法被卸载</Chinesesimp>
         </Key>
-        <Key ID="STR_ACE_Cargo_makeLoadable_displayName">
-            <English>Make Object Loadable</English>
-            <German>Objekt ein/entladbar machen</German>
-            <Polish>Ustaw jako ładowalny</Polish>
-            <Italian>Rendi oggetto caricabile</Italian>
-            <Spanish>Hacer objeto cargable</Spanish>
-            <French>Rendre l'objet chargeable</French>
-            <Czech>Vytvořit objekt nakladatelným</Czech>
-            <Portuguese>Fazer objeto carregável</Portuguese>
-            <Russian>Сделать объект загружаемым</Russian>
-            <Japanese>オブジェクトを積載可能に</Japanese>
-            <Korean>물체를 화물화시키기</Korean>
-            <Chinese>使物件可裝載</Chinese>
-            <Chinesesimp>使物件可装载</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Cargo_makeLoadable_description">
-            <English>Sets the synced object as loadable by the cargo system.</English>
-            <German>Das synchronisierte Objekt wird dem Frachtsystem hinzugefügt und ist ein- und entladbar.</German>
-            <Polish>Ustawia zsynchronizowany obiekt jako możliwy do załadowania poprzez system cargo</Polish>
-            <Italian>Imposta l'oggetto sincronizzato come caricabile dal sistema cargo</Italian>
-            <Spanish>Sincronizar un objecto para hacerlo cargable.</Spanish>
-            <French>Rend l'objet synchronisé comme chargeable par le système de cargaison.</French>
-            <Czech>Nastaví synchronizované objekty nakladatelnými za pomocí Nákladního systému.</Czech>
-            <Portuguese>Seta o objeto sincronizado como carregável</Portuguese>
-            <Russian>Делает синхронизированный объект загружаемым для модуля перевозки грузов.</Russian>
-            <Japanese>オブジェクトを同期させると、カーゴ システムによる積載が可能になります。</Japanese>
-            <Korean>물체를 화물 시스템과 동기화시켜 실을 수 있게 합니다</Korean>
-            <Chinese>使用同步線來使該物件可被裝載.</Chinese>
-            <Chinesesimp>使用同步线来使该物件可被装载.</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Cargo_makeLoadable_setSize_displayName">
-            <English>Object's Size</English>
-            <German>Objektgröße</German>
-            <Polish>Rozmiar obiektu</Polish>
-            <Italian>Dimensioni dell'oggetto</Italian>
-            <Spanish>Tamaño del objeto</Spanish>
-            <French>Taille de l'objet</French>
-            <Czech>Velikost objektu</Czech>
-            <Portuguese>Tamanho do objeto</Portuguese>
-            <Russian>Размер объекта</Russian>
-            <Japanese>オブジェクトの大きさ</Japanese>
-            <Korean>물체 크기</Korean>
-            <Chinese>物件的大小</Chinese>
-            <Chinesesimp>物件的大小</Chinesesimp>
-        </Key>
         <Key ID="STR_ACE_Cargo_space_edenName">
             <English>Cargo Space</English>
             <German>Frachtraum</German>

diff --git a/addons/rearm/XEH_PREP.hpp b/addons/rearm/XEH_PREP.hpp
@@ -1,4 +1,3 @@
-
 PREP(addMagazineToSupply);
 PREP(addRearmActions);
 PREP(addVehicleMagazinesToSupply);
@@ -11,7 +10,6 @@ PREP(disable);
 PREP(dropAmmo);
 PREP(getAllRearmTurrets);
 PREP(getCaliber);
-PREP(getHardpointMagazines);
 PREP(getMaxMagazines);
 PREP(getNeedRearmMagazines);
 PREP(getSupplyCount);

diff --git a/addons/rearm/functions/fnc_getHardpointMagazines.sqf b/addons/rearm/functions/fnc_getHardpointMagazines.sqf
diff --git a/addons/spectator/XEH_PREP.hpp b/addons/spectator/XEH_PREP.hpp
@@ -43,7 +43,6 @@ PREP(handleFired);
 PREP(moduleSpectatorSettings);
 PREP(respawnTemplate);
 PREP(setFocus);
-PREP(stageSpectator);
 PREP(switchFocus);
 
 // Public functions
@@ -55,10 +54,3 @@ PREP(updateCameraModes);
 PREP(updateSides);
 PREP(updateUnits);
 PREP(updateVisionModes);
-
-// Deprecated (temp)
-PREP(interrupt);
-DFUNC(updateSpectatableSides) = {
-    ACE_DEPRECATED(QFUNC(updateSpectatableSides),"3.12.0",QFUNC(updateSides));
-    _this call FUNC(updateSides);
-};
diff --git a/addons/spectator/functions/fnc_interrupt.sqf b/addons/spectator/functions/fnc_interrupt.sqf
diff --git a/addons/spectator/functions/fnc_setCameraAttributes.sqf b/addons/spectator/functions/fnc_setCameraAttributes.sqf
@@ -42,10 +42,6 @@ params [
     ["_direction",nil,[0]]
 ];
 
-if (count _this > 5) then {
-    ACE_DEPRECATED("Use of ""tilt"", ""zoom"" and ""speed"" camera attributes","3.12.0","N/A")
-};
-
 // Apply if camera exists
 if !(isNil QGVAR(camera)) then {
     // These functions are smart and handle unavailable inputs