diff --git a/addons/filters/$PBOPREFIX$ b/addons/filters/$PBOPREFIX$ deleted file mode 100644 index 06f96465a9..0000000000 --- a/addons/filters/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\filters \ No newline at end of file diff --git a/addons/filters/config.cpp b/addons/filters/config.cpp deleted file mode 100644 index a7b7bae6df..0000000000 --- a/addons/filters/config.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author[] = {""}; - authorUrl = ""; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" diff --git a/addons/filters/functions/script_component.hpp b/addons/filters/functions/script_component.hpp deleted file mode 100644 index 500275e357..0000000000 --- a/addons/filters/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\z\ace\addons\filters\script_component.hpp" \ No newline at end of file diff --git a/addons/filters/script_component.hpp b/addons/filters/script_component.hpp deleted file mode 100644 index e96072de4b..0000000000 --- a/addons/filters/script_component.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#define COMPONENT filters -#include "\z\ace\addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_FILTERS - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_ENABLED_FILTERS - #define DEBUG_SETTINGS DEBUG_ENABLED_FILTERS -#endif - -#include "\z\ace\addons\main\script_macros.hpp" - -#define IDC_FILTERLISTS 6554 -#define IDC_ITEMLIST_GROUND 632 -#define IDC_ITEMLIST_SOLDIER 640 -#define IDC_ITEMLIST_UNIFORM 633 -#define IDC_ITEMLIST_VEST 638 -#define IDC_ITEMLIST_BACKPACK 619 - -#define DUMMY_VALUE 127 diff --git a/addons/filters/stringtable.xml b/addons/filters/stringtable.xml deleted file mode 100644 index a7f9e30ec6..0000000000 --- a/addons/filters/stringtable.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Backpacks - Rucksäcke - - - Headgear - Kopfbedeckungen - - - Glasses - Brillen - - - Uniforms - Uniformen - - - Vests - Westen - - - Grenades - Granaten - - - Medical - Sanimaterial - - - diff --git a/addons/filters/CfgEventHandlers.hpp b/addons/inventory/CfgEventHandlers.hpp similarity index 100% rename from addons/filters/CfgEventHandlers.hpp rename to addons/inventory/CfgEventHandlers.hpp diff --git a/addons/filters/XEH_postInit.sqf b/addons/inventory/XEH_postInit.sqf similarity index 100% rename from addons/filters/XEH_postInit.sqf rename to addons/inventory/XEH_postInit.sqf diff --git a/addons/filters/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf similarity index 100% rename from addons/filters/XEH_preInit.sqf rename to addons/inventory/XEH_preInit.sqf diff --git a/addons/inventory/config.cpp b/addons/inventory/config.cpp index 1190525901..f0982a46b4 100644 --- a/addons/inventory/config.cpp +++ b/addons/inventory/config.cpp @@ -6,11 +6,13 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; - author[] = {"Pabst Mirror"}; + author[] = {"Pabst Mirror, commy2"}; authorUrl = "https://github.com/PabstMirror/"; VERSION_CONFIG; }; }; +#include "CfgEventHandlers.hpp" + #include "RscDisplayInventory.hpp" #include "ACE_Settings.hpp" diff --git a/addons/filters/functions/fnc_addCustomFilter.sqf b/addons/inventory/functions/fnc_addCustomFilter.sqf similarity index 100% rename from addons/filters/functions/fnc_addCustomFilter.sqf rename to addons/inventory/functions/fnc_addCustomFilter.sqf diff --git a/addons/filters/functions/fnc_currentItemListBox.sqf b/addons/inventory/functions/fnc_currentItemListBox.sqf similarity index 100% rename from addons/filters/functions/fnc_currentItemListBox.sqf rename to addons/inventory/functions/fnc_currentItemListBox.sqf diff --git a/addons/filters/functions/fnc_filterBackpacks.sqf b/addons/inventory/functions/fnc_filterBackpacks.sqf similarity index 100% rename from addons/filters/functions/fnc_filterBackpacks.sqf rename to addons/inventory/functions/fnc_filterBackpacks.sqf diff --git a/addons/filters/functions/fnc_filterGrenades.sqf b/addons/inventory/functions/fnc_filterGrenades.sqf similarity index 100% rename from addons/filters/functions/fnc_filterGrenades.sqf rename to addons/inventory/functions/fnc_filterGrenades.sqf diff --git a/addons/filters/functions/fnc_filterHeadgear.sqf b/addons/inventory/functions/fnc_filterHeadgear.sqf similarity index 100% rename from addons/filters/functions/fnc_filterHeadgear.sqf rename to addons/inventory/functions/fnc_filterHeadgear.sqf diff --git a/addons/filters/functions/fnc_filterItems.sqf b/addons/inventory/functions/fnc_filterItems.sqf similarity index 100% rename from addons/filters/functions/fnc_filterItems.sqf rename to addons/inventory/functions/fnc_filterItems.sqf diff --git a/addons/filters/functions/fnc_filterMagazines.sqf b/addons/inventory/functions/fnc_filterMagazines.sqf similarity index 100% rename from addons/filters/functions/fnc_filterMagazines.sqf rename to addons/inventory/functions/fnc_filterMagazines.sqf diff --git a/addons/filters/functions/fnc_filterMedical.sqf b/addons/inventory/functions/fnc_filterMedical.sqf similarity index 100% rename from addons/filters/functions/fnc_filterMedical.sqf rename to addons/inventory/functions/fnc_filterMedical.sqf diff --git a/addons/filters/functions/fnc_filterUniforms.sqf b/addons/inventory/functions/fnc_filterUniforms.sqf similarity index 100% rename from addons/filters/functions/fnc_filterUniforms.sqf rename to addons/inventory/functions/fnc_filterUniforms.sqf diff --git a/addons/filters/functions/fnc_filterVests.sqf b/addons/inventory/functions/fnc_filterVests.sqf similarity index 100% rename from addons/filters/functions/fnc_filterVests.sqf rename to addons/inventory/functions/fnc_filterVests.sqf diff --git a/addons/filters/functions/fnc_filterWeapons.sqf b/addons/inventory/functions/fnc_filterWeapons.sqf similarity index 100% rename from addons/filters/functions/fnc_filterWeapons.sqf rename to addons/inventory/functions/fnc_filterWeapons.sqf diff --git a/addons/filters/functions/fnc_forceItemListUpdate.sqf b/addons/inventory/functions/fnc_forceItemListUpdate.sqf similarity index 100% rename from addons/filters/functions/fnc_forceItemListUpdate.sqf rename to addons/inventory/functions/fnc_forceItemListUpdate.sqf diff --git a/addons/filters/functions/fnc_inventoryDisplayLoaded.sqf b/addons/inventory/functions/fnc_inventoryDisplayLoaded.sqf similarity index 100% rename from addons/filters/functions/fnc_inventoryDisplayLoaded.sqf rename to addons/inventory/functions/fnc_inventoryDisplayLoaded.sqf diff --git a/addons/filters/functions/fnc_onLBSelChanged.sqf b/addons/inventory/functions/fnc_onLBSelChanged.sqf similarity index 100% rename from addons/filters/functions/fnc_onLBSelChanged.sqf rename to addons/inventory/functions/fnc_onLBSelChanged.sqf diff --git a/addons/inventory/functions/script_component.hpp b/addons/inventory/functions/script_component.hpp new file mode 100644 index 0000000000..07c5e38d2d --- /dev/null +++ b/addons/inventory/functions/script_component.hpp @@ -0,0 +1 @@ +#include "\z\ace\addons\inventory\script_component.hpp" \ No newline at end of file diff --git a/addons/inventory/script_component.hpp b/addons/inventory/script_component.hpp index 248f324b36..b013e08570 100644 --- a/addons/inventory/script_component.hpp +++ b/addons/inventory/script_component.hpp @@ -2,11 +2,20 @@ #include "\z\ace\addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_INVENTORY - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_SETTINGS_INVENTORY - #define DEBUG_SETTINGS DEBUG_SETTINGS_INVENTORY + #define DEBUG_SETTINGS DEBUG_SETTINGS_INVENTORY #endif #include "\z\ace\addons\main\script_macros.hpp" + +#define IDC_FILTERLISTS 6554 +#define IDC_ITEMLIST_GROUND 632 +#define IDC_ITEMLIST_SOLDIER 640 +#define IDC_ITEMLIST_UNIFORM 633 +#define IDC_ITEMLIST_VEST 638 +#define IDC_ITEMLIST_BACKPACK 619 + +#define DUMMY_VALUE 127 diff --git a/addons/inventory/stringtable.xml b/addons/inventory/stringtable.xml index 04cac46b87..af21fe3ddf 100644 --- a/addons/inventory/stringtable.xml +++ b/addons/inventory/stringtable.xml @@ -25,5 +25,33 @@ Normalmente il menù inventario è scalato in base alle dimensioni interfaccia. Questa opzione di permette di ingrandirlo ulteriormente ma senza aumentare la dimensione del testo. Normalmente o tamanho da tela do inventário é ditada pelo tamanho da UI. Isso permite aumentar o tamanho da tela de inventário, mas não aumenta o tamanho da fonte, permitindo que mais linhas sejam visualizadas. + + Backpacks + Rucksäcke + + + Headgear + Kopfbedeckungen + + + Glasses + Brillen + + + Uniforms + Uniformen + + + Vests + Westen + + + Grenades + Granaten + + + Medical + Sanimaterial +