more macros for common

addons/common/CfgVehicles.hpp

@@ -15,8 +15,8 @@ class CfgVehicles {
         showIn3D = 0;
         onlyForPlayer = 1;
         shortcut = "DefaultAction";
-        condition = "call ACE_Common_UserActionFireCondition";
-        statement = "call ACE_Common_UserActionFire";
+        condition = QUOTE(call GVAR(UserActionFireCondition));
+        statement = QUOTE(call GVAR(UserActionFire));
         userActionID = 100;
       };
     };

addons/common/ProgressScreen.hpp

@@ -1,8 +1,8 @@
 
-class ACE_Common_ProgressBar_Dialog {
+class GVAR(ProgressBar_Dialog) {
     idd = -1;
     movingEnable = false;
-    onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];";
+    onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBar)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBarTitle)),(_this select 0) displayCtrl 2)];);
     objects[] = {};
 
     class controlsBackground {
@@ -66,10 +66,10 @@ class ACE_Common_ProgressBar_Dialog {
     };
 };
 
-class ACE_Common_DisableMouse_Dialog {
+class GVAR(DisableMouse_Dialog) {
     idd = -1;
     movingEnable = false;
-    onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];";
+    onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgDisableMouse)),_this select 0)];);
     objects[] = {};
     class controlsBackground {
         class Background {

addons/common/config.cpp

@@ -72,7 +72,7 @@ class ACE_Options {
 /*
 class RscControlsGroupNoScrollbars;
 class RscAttributeInventory: RscControlsGroupNoScrollbars {
-    onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_Common_fnc_addCuratorUnloadEventhandler;";
+    onSetFocus = QUOTE([ARR_3(_this,""RscAttributeInventory"",'CuratorCommon')] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call DFUNC(addCuratorUnloadEventhandler););
 };
 */
 

addons/common/scripts/KeyInput/initCanInteractFunction.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"];
 

addons/common/scripts/KeyInput/initKeys.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _config = configFile >> "ACE_Default_Keys";
 _count = count _config;

addons/common/scripts/KeyInput/initScrollWheel.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 GVAR(ScrollWheelFrame) = diag_frameno;
 

addons/common/scripts/KeyInput/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\common\script_component.hpp"

addons/common/scripts/Version/checkVersionNumber.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 sleep 1;  //wait for module
 
@@ -19,7 +19,7 @@ if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then {
   } forEach activatedAddons;
 };
 
-_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version");
+_versionMain = parseNumber getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "version");
 
 _versions = [];
 {

addons/common/scripts/Version/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\common\script_component.hpp"

addons/common/scripts/assignedItemFix.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 if (isNil "ACE_itemFix") then {
   ACE_isMapEnabled     = call {_config = missionConfigFile >> "showMap";     !isNumber _config || {getNumber _config == 1}};

addons/common/scripts/closeMenu.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 closeDialog 0;
 [localize QUOTE(DOUBLES(STR,GVAR(ProfileNotSaved)))] call FUNC(displayTextStructured);

addons/common/scripts/editKey.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define GRAY [0.25, 0.25, 0.25, 1]
 #define WHITE [1, 1, 1, 1]

addons/common/scripts/keyInput.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define FORBIDDEN_KEYS [42, 54, 29, 157, 56, 184, 0, 183, 197, 1]
 

addons/common/scripts/keyRelease.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _keyIndex = _this select 1;
 

addons/common/scripts/nextKeys.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define OFFSET_1 100
 #define OFFSET_2 200

addons/common/scripts/openMenu.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define OFFSET_1 100
 #define OFFSET_2 200

addons/common/scripts/readParameters.sqf

@@ -1,5 +1,5 @@
 // by CAA-Picard
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 // Read ACE_Parameters from config and set them on the mission namespace
 _config = configFile >> "ACE_Parameters_Numeric";

addons/common/scripts/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\common\script_component.hpp"

addons/common/scripts/toggleState.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _index = _this select 0;