From 7ead73bc1ff0519a9b60f98645c798794b714ca4 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 14 Jan 2015 01:55:23 -0600 Subject: [PATCH] AGM Grenades Base --- TO_MERGE/agm/Grenades/texHeaders.bin | Bin 768 -> 0 bytes addons/grenades/$PBOPREFIX$ | 1 + .../agm/Grenades => addons/grenades}/AGM_M84.p3d | Bin .../grenades}/AGM_M84_thrown.p3d | Bin .../grenades}/UI/agm_m84_x_ca.paa | Bin .../Grenades => addons/grenades}/clientInit.sqf | 0 .../agm/Grenades => addons/grenades}/config.cpp | 0 .../grenades}/data/agm_m84.rvmat | Bin .../grenades}/data/agm_m84_co.paa | Bin .../grenades}/data/agm_m84_nohq.paa | Bin .../grenades}/data/agm_m84_smdi.paa | Bin .../grenades}/functions/fn_flashbangEffect.sqf | 0 .../grenades}/functions/fn_nextMode.sqf | 0 .../grenades}/functions/fn_throwGrenade.sqf | 0 addons/grenades/script_component.hpp | 14 ++++++++++++++ .../Grenades => addons/grenades}/stringtable.xml | 0 16 files changed, 15 insertions(+) delete mode 100644 TO_MERGE/agm/Grenades/texHeaders.bin create mode 100644 addons/grenades/$PBOPREFIX$ rename {TO_MERGE/agm/Grenades => addons/grenades}/AGM_M84.p3d (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/AGM_M84_thrown.p3d (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/UI/agm_m84_x_ca.paa (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/clientInit.sqf (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/config.cpp (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/data/agm_m84.rvmat (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/data/agm_m84_co.paa (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/data/agm_m84_nohq.paa (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/data/agm_m84_smdi.paa (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/functions/fn_flashbangEffect.sqf (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/functions/fn_nextMode.sqf (100%) rename {TO_MERGE/agm/Grenades => addons/grenades}/functions/fn_throwGrenade.sqf (100%) create mode 100644 addons/grenades/script_component.hpp rename {TO_MERGE/agm/Grenades => addons/grenades}/stringtable.xml (100%) diff --git a/TO_MERGE/agm/Grenades/texHeaders.bin b/TO_MERGE/agm/Grenades/texHeaders.bin deleted file mode 100644 index 718d6490fc2a28c44ec26a190d4fe81bf6f9f601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZvaF-rqM5QXO)IdvOEi44J z5&aS3uLu@uX{A=dMi5DSvv->iafjg^*~#qtm>Hg#jaWp~j+C#Q{SvuUuQ@~|SF&C# z)#b>Ye5I}nX(KHw=4HJNFP@5~CPt&XsaSF_<9YgCYS0+1Z7zv!LqOm4LR<2j&C4OY zfDoPUCki7(m#2wB2+_y$MBNC{XA4A~2+@6uL3?NyI)W5$`iTD)hN4(+GN4fWDdZo9 z^mbxLGcfL&42n;sv1U;GJtTjW=M;}k83x7cbB00j<`ID)ghIvf3&Wr|ePtLF=dKNd z;s@wwB%11TP-Z=c$4bTdtY+L~v0QCoK&ANmXAWE2nn2n#30kKxFoMfq3O#Ubrtlgu z1UA2CDIl=9nl}VCe-#XY&4r>Nu=y7H9%%?_KY2&;<1OL5JgqsCt~=gBfcHCK!=FMf z+1R7K=$6+YkP6?a(tG4PReXpa{e4k<61D=TiqDs5 G)uLa+S&#$( diff --git a/addons/grenades/$PBOPREFIX$ b/addons/grenades/$PBOPREFIX$ new file mode 100644 index 0000000000..f43501a506 --- /dev/null +++ b/addons/grenades/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\grenades \ No newline at end of file diff --git a/TO_MERGE/agm/Grenades/AGM_M84.p3d b/addons/grenades/AGM_M84.p3d similarity index 100% rename from TO_MERGE/agm/Grenades/AGM_M84.p3d rename to addons/grenades/AGM_M84.p3d diff --git a/TO_MERGE/agm/Grenades/AGM_M84_thrown.p3d b/addons/grenades/AGM_M84_thrown.p3d similarity index 100% rename from TO_MERGE/agm/Grenades/AGM_M84_thrown.p3d rename to addons/grenades/AGM_M84_thrown.p3d diff --git a/TO_MERGE/agm/Grenades/UI/agm_m84_x_ca.paa b/addons/grenades/UI/agm_m84_x_ca.paa similarity index 100% rename from TO_MERGE/agm/Grenades/UI/agm_m84_x_ca.paa rename to addons/grenades/UI/agm_m84_x_ca.paa diff --git a/TO_MERGE/agm/Grenades/clientInit.sqf b/addons/grenades/clientInit.sqf similarity index 100% rename from TO_MERGE/agm/Grenades/clientInit.sqf rename to addons/grenades/clientInit.sqf diff --git a/TO_MERGE/agm/Grenades/config.cpp b/addons/grenades/config.cpp similarity index 100% rename from TO_MERGE/agm/Grenades/config.cpp rename to addons/grenades/config.cpp diff --git a/TO_MERGE/agm/Grenades/data/agm_m84.rvmat b/addons/grenades/data/agm_m84.rvmat similarity index 100% rename from TO_MERGE/agm/Grenades/data/agm_m84.rvmat rename to addons/grenades/data/agm_m84.rvmat diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_co.paa b/addons/grenades/data/agm_m84_co.paa similarity index 100% rename from TO_MERGE/agm/Grenades/data/agm_m84_co.paa rename to addons/grenades/data/agm_m84_co.paa diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_nohq.paa b/addons/grenades/data/agm_m84_nohq.paa similarity index 100% rename from TO_MERGE/agm/Grenades/data/agm_m84_nohq.paa rename to addons/grenades/data/agm_m84_nohq.paa diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_smdi.paa b/addons/grenades/data/agm_m84_smdi.paa similarity index 100% rename from TO_MERGE/agm/Grenades/data/agm_m84_smdi.paa rename to addons/grenades/data/agm_m84_smdi.paa diff --git a/TO_MERGE/agm/Grenades/functions/fn_flashbangEffect.sqf b/addons/grenades/functions/fn_flashbangEffect.sqf similarity index 100% rename from TO_MERGE/agm/Grenades/functions/fn_flashbangEffect.sqf rename to addons/grenades/functions/fn_flashbangEffect.sqf diff --git a/TO_MERGE/agm/Grenades/functions/fn_nextMode.sqf b/addons/grenades/functions/fn_nextMode.sqf similarity index 100% rename from TO_MERGE/agm/Grenades/functions/fn_nextMode.sqf rename to addons/grenades/functions/fn_nextMode.sqf diff --git a/TO_MERGE/agm/Grenades/functions/fn_throwGrenade.sqf b/addons/grenades/functions/fn_throwGrenade.sqf similarity index 100% rename from TO_MERGE/agm/Grenades/functions/fn_throwGrenade.sqf rename to addons/grenades/functions/fn_throwGrenade.sqf diff --git a/addons/grenades/script_component.hpp b/addons/grenades/script_component.hpp new file mode 100644 index 0000000000..f7b11616be --- /dev/null +++ b/addons/grenades/script_component.hpp @@ -0,0 +1,14 @@ +#define COMPONENT grenades +#include "\z\ace\addons\main\script_mod.hpp" + +// #define DEBUG_MODE_FULL + +#ifdef DEBUG_ENABLED_COMMON + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_ENABLED_COMMON + #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON +#endif + +#include "\z\ace\addons\main\script_macros.hpp" diff --git a/TO_MERGE/agm/Grenades/stringtable.xml b/addons/grenades/stringtable.xml similarity index 100% rename from TO_MERGE/agm/Grenades/stringtable.xml rename to addons/grenades/stringtable.xml