Merge pull request #180 from Dorbedo/Issue142_proposal

Issue142 proposal
CBATeam · Oct 11, 2015 · 540393e · 540393e
2 parents 5b9c20a + b8ba6aa
commit 540393e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 66 deletions.
diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
@@ -674,8 +674,9 @@ Macro: GVAR()
     Sickboy
 ------------------------------------------- */
 #define GVAR(var1) DOUBLES(ADDON,var1)
-#define EGVAR(var1,var2) DOUBLES(DOUBLES(PREFIX,var1),var2)
+#define EGVAR(var1,var2) TRIPLES(PREFIX,var1,var2)
 #define QGVAR(var1) QUOTE(GVAR(var1))
+#define QEGVAR(var1,var2) QUOTE(EGVAR(var1,var2))
 
 /* -------------------------------------------
 Macro: GVARMAIN()
@@ -694,6 +695,7 @@ Macro: GVARMAIN()
     Sickboy
 ------------------------------------------- */
 #define GVARMAIN(var1) GVARMAINS(PREFIX,var1)
+#define QGVARMAIN(var1) QUOTE(GVARMAIN(var1))
 // TODO: What's this?
 #define SETTINGS DOUBLES(PREFIX,settings)
 #define CREATELOGIC CREATELOGICS(PREFIX,COMPONENT)

diff --git a/addons/main/script_macros_mission.hpp b/addons/main/script_macros_mission.hpp
@@ -2,65 +2,66 @@
 
 /*
     Header: script_macros_mission.hpp
-    
+
     Description:
         Modifies script_common_macros.hpp for compatiblity with missions.
         Some addon specific functionality might be lost.
-    
+
     Authors:
         Muzzleflash
-        
+
     Changes from script_macros_mission.hpp:
         Follows Standard:
             Object variables: PREFIX_COMPONENT
             Main-object variables: PREFIX_main
             Paths: PREFIX\COMPONENT\SCRIPTNAME.sqf
                 Or if CUSTOM_FOLDER is defined:
-                CUSTOM_FOLDER\SCRIPTNAME.sqf  
+                CUSTOM_FOLDER\SCRIPTNAME.sqf
             eg. six\sys_menu\fDate.sqf
 
     Usage:
         Define PREFIX and COMPONENT, then include this file:
             #include "\x\cba\addons\main\script_macros_mission.hpp"
+
 */
 
-// TODO: Alternate COMPILE_FILE macros that add e.g "mission\"
+/*
+    CUSTOM_FOLDER
+
+    Custom folder to search for files in. Will not change variable names.
+    Default is PREFIX\COMPONENT
+
+    Example:
+        (begin example)
+            #define CUSTOM_FOLDER MyPackage\ScriptA
+        (end)
+
+        (begin example)
+            #define CUSTOM_FOLDER COMPONENT\functions
+        (end)
+
+
+*/
+
+#ifdef CUSTOM_FOLDER
+    #define PATHTO_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3.sqf
+    #define PATHTOF_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3
+    #define PATHTOF2_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3
+#else
+    #define PATHTO_SYS(var1,var2,var3) ##var1\##var2\##var3.sqf
+    #define PATHTOF_SYS(var1,var2,var3) ##var1\##var2\##var3
+    #define PATHTOF_SYS2(var1,var2,var3) ##var1\##var2\##var3
+#endif
 
-/************************** REMOVED ***********************/
+
+/************************** REMOVAL OF MACROS ***********************/
 
 #undef MAINPREFIX
 #undef SUBPREFIX
 #undef VERSION
 #undef VERSION_AR
 #undef VERSION_CONFIG
 
-#undef MODULAR
-#undef COMPONENT_T
-#undef COMPONENT_M
-#undef COMPONENT_S
-#undef COMPONENT_C
-#undef COMPONENT_F
-
-// Missions should support paths without leading \
-#undef PATHTO_SYS
-#define PATHTO_SYS(var1,var2,var3) MAINPREFIX\##var1\SUBPREFIX\##var2\##var3.sqf
-
-#undef PATHTOF2_SYS
-
-#undef PATHTO_R
-#undef PATHTO_T
-#undef PATHTO_M
-#undef PATHTO_S
-#undef PATHTO_C
-#undef PATHTO_F
-
-#undef QPATHTO_R
-#undef QPATHTO_T
-#undef QPATHTO_M
-#undef QPATHTO_S
-#undef QPATHTO_C
-#undef QPATHTO_F
-
 #undef VERSIONING_SYS
 #undef VERSIONING
 
@@ -74,35 +75,4 @@
 #undef XEH_PRE_SINIT
 #undef XEH_POST_INIT
 #undef XEH_POST_CINIT
-#undef XEH_POST_SINIT
-
-/************************** ADDED *************************/
-
-/* 
-    CUSTOM_FOLDER
-
-    Custom folder to search for files in. Will not change variable names.
-    Default is PREFIX\COMPONENT
-
-    Example:
-    #define CUSTOM_FOLDER MyPackage\ScriptA
-*/
-
-/************************ MODIFIED ************************/
-//This saves redefinition
-#define COMPONENT_F COMPONENT
-/* of these macros
-PATHTO
-COMPILE_FILE
-PREP
-PREPMAIN
-*/
-
-#ifdef CUSTOM_FOLDER
-    #define PATHTO_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3.sqf
-    #define PATHTOF_SYS(var1,var2,var3) ##CUSTOM_FOLDER\##var3
-#else
-    #define PATHTO_SYS(var1,var2,var3) ##var1\##var2\##var3.sqf
-    #define PATHTOF_SYS(var1,var2,var3) ##var1\##var2\##var3
-#endif
-
+#undef XEH_POST_SINIT