Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use MACRO_ADDITEM from main instead of redefining

Browse Source
This commit is contained in:
PabstMirror 2015-03-11 17:36:40 -05:00
parent d02b5d2125
commit bed312dcee
11 changed files with 71 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/captives/CfgVehicles.hpp
View File

@ -154,15 +154,10 @@ class CfgVehicles {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADUNLOADCAPTIVE
}; };
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_CableTie,12) MACRO_ADDITEM(ACE_CableTie,12);
}; };
}; };

47
addons/explosives/CfgVehicles.hpp
View File

@ -1,8 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class Man; class Man;
@ -142,47 +137,47 @@ class CfgVehicles {
class Box_NATO_AmmoOrd_F: NATO_Box_Base { class Box_NATO_AmmoOrd_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Clacker,12) MACRO_ADDITEM(ACE_Clacker,12);
MACRO_ADDITEM(ACE_M26_Clacker,6) MACRO_ADDITEM(ACE_M26_Clacker,6);
MACRO_ADDITEM(ACE_DefusalKit,12) MACRO_ADDITEM(ACE_DefusalKit,12);
}; };
}; };
class Box_East_AmmoOrd_F: EAST_Box_Base { class Box_East_AmmoOrd_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Clacker,12) MACRO_ADDITEM(ACE_Clacker,12);
MACRO_ADDITEM(ACE_M26_Clacker,6) MACRO_ADDITEM(ACE_M26_Clacker,6);
MACRO_ADDITEM(ACE_DefusalKit,12) MACRO_ADDITEM(ACE_DefusalKit,12);
}; };
}; };
class Box_IND_AmmoOrd_F: IND_Box_Base { class Box_IND_AmmoOrd_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Clacker,12) MACRO_ADDITEM(ACE_Clacker,12);
MACRO_ADDITEM(ACE_M26_Clacker,6) MACRO_ADDITEM(ACE_M26_Clacker,6);
MACRO_ADDITEM(ACE_DefusalKit,12) MACRO_ADDITEM(ACE_DefusalKit,12);
MACRO_ADDITEM(ACE_Deadmanswitch,2) MACRO_ADDITEM(ACE_Deadmanswitch,2);
MACRO_ADDITEM(ACE_Cellphone,3) MACRO_ADDITEM(ACE_Cellphone,3);
}; };
}; };
class Box_FIA_Ammo_F: FIA_Box_Base_F { class Box_FIA_Ammo_F: FIA_Box_Base_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Clacker,2) MACRO_ADDITEM(ACE_Clacker,2);
MACRO_ADDITEM(ACE_M26_Clacker,2) MACRO_ADDITEM(ACE_M26_Clacker,2);
MACRO_ADDITEM(ACE_DefusalKit,2) MACRO_ADDITEM(ACE_DefusalKit,2);
MACRO_ADDITEM(ACE_Deadmanswitch,1) MACRO_ADDITEM(ACE_Deadmanswitch,1);
MACRO_ADDITEM(ACE_Cellphone,2) MACRO_ADDITEM(ACE_Cellphone,2);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Clacker,12) MACRO_ADDITEM(ACE_Clacker,12);
MACRO_ADDITEM(ACE_M26_Clacker,6) MACRO_ADDITEM(ACE_M26_Clacker,6);
MACRO_ADDITEM(ACE_DefusalKit,12) MACRO_ADDITEM(ACE_DefusalKit,12);
MACRO_ADDITEM(ACE_Deadmanswitch,6) MACRO_ADDITEM(ACE_Deadmanswitch,6);
MACRO_ADDITEM(ACE_Cellphone,10) MACRO_ADDITEM(ACE_Cellphone,10);
}; };
}; };

33
addons/grenades/CfgVehicles.hpp
View File

@ -1,8 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class NATO_Box_Base; class NATO_Box_Base;
class EAST_Box_Base; class EAST_Box_Base;
@ -11,35 +6,35 @@ class CfgVehicles {
class Box_NATO_Grenades_F: NATO_Box_Base { class Box_NATO_Grenades_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_White,12) MACRO_ADDITEM(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12) MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12) MACRO_ADDITEM(ACE_M84,12);
}; };
}; };
class Box_East_Grenades_F: EAST_Box_Base { class Box_East_Grenades_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12) MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12) MACRO_ADDITEM(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_M84,12) MACRO_ADDITEM(ACE_M84,12);
}; };
}; };
class Box_IND_Grenades_F: IND_Box_Base { class Box_IND_Grenades_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12) MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12) MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12) MACRO_ADDITEM(ACE_M84,12);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_White,12) MACRO_ADDITEM(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12) MACRO_ADDITEM(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12) MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_HandFlare_Yellow,12) MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_M84,12) MACRO_ADDITEM(ACE_M84,12);
}; };
}; };
}; };

26
addons/hearing/CfgVehicles.hpp
View File

@ -1,9 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
@ -41,61 +35,61 @@ class CfgVehicles {
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class B_supplyCrate_F: ReammoBox_F { class B_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class Box_East_Support_F: EAST_Box_Base { class Box_East_Support_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class O_supplyCrate_F: B_supplyCrate_F { class O_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class Box_IND_Support_F: IND_Box_Base { class Box_IND_Support_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class Box_FIA_Support_F: FIA_Box_Base_F { class Box_FIA_Support_F: FIA_Box_Base_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class I_supplyCrate_F: B_supplyCrate_F { class I_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class IG_supplyCrate_F: ReammoBox_F { class IG_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class C_supplyCrate_F: ReammoBox_F { class C_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_EarBuds,12) MACRO_ADDITEM(ACE_EarBuds,12);
}; };
}; };
}; };

5
addons/interaction/CfgVehicles.hpp
View File

@ -1,8 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class Module_F; class Module_F;

6
addons/kestrel/CfgVehicles.hpp
View File

@ -1,9 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
}
class CfgVehicles { class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {

6
addons/laserpointer/CfgVehicles.hpp
View File

@ -1,9 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
}
class CfgVehicles { class CfgVehicles {
class NATO_Box_Base; class NATO_Box_Base;
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {

15
addons/map/CfgVehicles.hpp
View File

@ -1,8 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
@ -103,31 +98,31 @@ class CfgVehicles {
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_MapTools,12) MACRO_ADDITEM(ACE_MapTools,12);
}; };
}; };
class Box_East_Support_F: EAST_Box_Base { class Box_East_Support_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_MapTools,12) MACRO_ADDITEM(ACE_MapTools,12);
}; };
}; };
class Box_IND_Support_F: IND_Box_Base { class Box_IND_Support_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_MapTools,12) MACRO_ADDITEM(ACE_MapTools,12);
}; };
}; };
class Box_FIA_Support_F: FIA_Box_Base_F { class Box_FIA_Support_F: FIA_Box_Base_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_MapTools,12) MACRO_ADDITEM(ACE_MapTools,12);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_MapTools,12) MACRO_ADDITEM(ACE_MapTools,12);
}; };
}; };

15
addons/nightvision/CfgVehicles.hpp
View File

@ -4,19 +4,14 @@ class CfgVehicles {
ACE_NightVision_blur = 0.055; ACE_NightVision_blur = 0.055;
}; };
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_NVG_Gen1,6) MACRO_ADDITEM(ACE_NVG_Gen1,6);
MACRO_ADDITEM(ACE_NVG_Gen2,6) MACRO_ADDITEM(ACE_NVG_Gen2,6);
//MACRO_ADDITEM(ACE_NVG_Gen3,6) //MACRO_ADDITEM(ACE_NVG_Gen3,6);
MACRO_ADDITEM(ACE_NVG_Gen4,6) MACRO_ADDITEM(ACE_NVG_Gen4,6);
MACRO_ADDITEM(ACE_NVG_Wide,6) MACRO_ADDITEM(ACE_NVG_Wide,6);
}; };
}; };
}; };

25
addons/overheating/CfgVehicles.hpp
View File

@ -1,8 +1,3 @@
#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class Man; class Man;
@ -39,61 +34,61 @@ class CfgVehicles {
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class B_supplyCrate_F: ReammoBox_F { class B_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class Box_East_Support_F: EAST_Box_Base { class Box_East_Support_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class O_supplyCrate_F: B_supplyCrate_F { class O_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class Box_IND_Support_F: IND_Box_Base { class Box_IND_Support_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class Box_FIA_Support_F: FIA_Box_Base_F { class Box_FIA_Support_F: FIA_Box_Base_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class I_supplyCrate_F: B_supplyCrate_F { class I_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class IG_supplyCrate_F: ReammoBox_F { class IG_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class C_supplyCrate_F: ReammoBox_F { class C_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2) MACRO_ADDITEM(ACE_SpareBarrel,2);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,6) MACRO_ADDITEM(ACE_SpareBarrel,6);
}; };
}; };

14
addons/smallarms/CfgVehicles.hpp
View File

@ -1,8 +1,4 @@
/*#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \ /*
name = #ITEM; \
count = COUNT; \
};
class CfgVehicles { class CfgVehicles {
class NATO_Box_Base; class NATO_Box_Base;
class EAST_Box_Base; class EAST_Box_Base;
@ -10,25 +6,25 @@ class CfgVehicles {
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_acc_flashlight_tls,5) MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
}; };
}; };
class Box_East_Support_F: EAST_Box_Base { class Box_East_Support_F: EAST_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_acc_flashlight_tls,5) MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
}; };
}; };
class Box_IND_Support_F: IND_Box_Base { class Box_IND_Support_F: IND_Box_Base {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_acc_flashlight_tls,5) MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_acc_flashlight_tls,2) MACRO_ADDITEM(ACE_acc_flashlight_tls,2);
}; };
}; };
};*/ };*/