From 0405b6aa86e999fe1a640465b3a43663f9dacfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 11 Oct 2015 12:33:21 +0200 Subject: [PATCH 1/2] added and changed som VAR definitions changed: EGVAR added: QEGVAR; QGVARMAIN; --- addons/main/script_macros_common.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp index 3a9ed10b8..7b9702d1b 100644 --- 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) From b8ba6aa083e09019830ddbcdae6918c51c8f3b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 11 Oct 2015 12:34:24 +0200 Subject: [PATCH 2/2] added the proposal from #142 removed `#undef MODULAR` --- addons/main/script_macros_mission.hpp | 100 +++++++++----------------- 1 file changed, 35 insertions(+), 65 deletions(-) diff --git a/addons/main/script_macros_mission.hpp b/addons/main/script_macros_mission.hpp index 98278fe41..bc4e3949a 100644 --- a/addons/main/script_macros_mission.hpp +++ b/addons/main/script_macros_mission.hpp @@ -2,31 +2,59 @@ /* 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 @@ -34,33 +62,6 @@ #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 \ No newline at end of file