Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated functionality for 3.12.0 #5878

Merged
merged 3 commits into from
Dec 10, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions addons/cargo/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,6 @@ class CfgVehicles {
sync[] = {};
};
};
class GVAR(makeLoadable): ACE_Module {
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"};
};
};

class LandVehicle;
class Car: LandVehicle {
Expand Down
Binary file removed addons/cargo/UI/Icon_Module_makeLoadable_ca.paa
Binary file not shown.
3 changes: 0 additions & 3 deletions addons/cargo/XEH_PREP.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

PREP(addCargoItem);
PREP(addCargoVehiclesActions);
PREP(canLoadItemIn);
Expand All @@ -9,8 +8,6 @@ PREP(handleDestroyed);
PREP(initObject);
PREP(initVehicle);
PREP(loadItem);
PREP(makeLoadable);
PREP(moduleMakeLoadable);
PREP(moduleSettings);
PREP(onMenuOpen);
PREP(paradropItem);
Expand Down
54 changes: 0 additions & 54 deletions addons/cargo/functions/fnc_makeLoadable.sqf

This file was deleted.

36 changes: 0 additions & 36 deletions addons/cargo/functions/fnc_moduleMakeLoadable.sqf

This file was deleted.

47 changes: 1 addition & 46 deletions addons/cargo/stringtable.xml
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions addons/rearm/XEH_PREP.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

PREP(addMagazineToSupply);
PREP(addRearmActions);
PREP(addVehicleMagazinesToSupply);
Expand All @@ -11,7 +10,6 @@ PREP(disable);
PREP(dropAmmo);
PREP(getAllRearmTurrets);
PREP(getCaliber);
PREP(getHardpointMagazines);
PREP(getMaxMagazines);
PREP(getNeedRearmMagazines);
PREP(getSupplyCount);
Expand Down
41 changes: 0 additions & 41 deletions addons/rearm/functions/fnc_getHardpointMagazines.sqf

This file was deleted.

8 changes: 0 additions & 8 deletions addons/spectator/XEH_PREP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ PREP(handleFired);
PREP(moduleSpectatorSettings);
PREP(respawnTemplate);
PREP(setFocus);
PREP(stageSpectator);
PREP(switchFocus);

// Public functions
Expand All @@ -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);
};
29 changes: 0 additions & 29 deletions addons/spectator/functions/fnc_interrupt.sqf

This file was deleted.

4 changes: 0 additions & 4 deletions addons/spectator/functions/fnc_setCameraAttributes.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading