Update includes, ignore ACE_debug cap vars (#656)

BourbonWarfare · Feb 23, 2025 · df0c6f9 · df0c6f9
1 parent 44981b4
commit df0c6f9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/.hemtt/lints.toml b/.hemtt/lints.toml
@@ -15,7 +15,7 @@ options.release = [
 [sqf.var_all_caps]
 enabled = true
 options.ignore = [
-    "ACRE_CORE_INIT", "ACRE_DATA_SYNCED", "ACRE_MAP_LOADED", "ACRE_IS_SPECTATOR"
+    "ACRE_CORE_INIT", "ACRE_DATA_SYNCED", "ACRE_MAP_LOADED", "ACRE_IS_SPECTATOR", "ACE_RECOMPILE", "ACE_RECOMPILES", "ACE_PFH_COUNTER"
 ]
 
 [sqf.banned_commands]

diff --git a/include/a3/3den/UI/resincl.inc b/include/a3/3den/UI/resincl.inc
@@ -187,7 +187,6 @@
 	IDC_DISPLAY3DEN_CREATE_GROUP_CIV,\
 	IDC_DISPLAY3DEN_CREATE_GROUP_EMPTY,\
 	IDC_DISPLAY3DEN_CREATE_GROUP_CUSTOM,\
-	IDC_DISPLAY3DEN_CREATE_FAVORITE,\
 	IDC_DISPLAY3DEN_CREATE_OBJECT_LOGIC,\
 	IDC_DISPLAY3DEN_CREATE_OBJECT_MODULE,\
 	IDC_DISPLAY3DEN_CREATE_TRIGGER,\

diff --git a/include/x/cba/addons/main/script_macros_common.hpp b/include/x/cba/addons/main/script_macros_common.hpp
@@ -1335,7 +1335,7 @@ Macros: PARAMS_n()
 
 /* -------------------------------------------
 Macro: DEFAULT_PARAM()
-    DEPRECATED - Use param/params commands added in Arma 3 1.48
+    DEPRECATED - Use param/params commands added in Arma 3 1.48 - Will not work with HEMTT 1.13.2+
 
     Getting a default function parameter. This may be used together with <PARAMS_n()> to have a mix of required and
     optional parameters.

diff --git a/include/x/cba/addons/xeh/script_xeh.hpp b/include/x/cba/addons/xeh/script_xeh.hpp
@@ -14,13 +14,16 @@ fired = "call cba_xeh_fnc_fired"; \
 animChanged = "call cba_xeh_fnc_animChanged"; \
 animDone = "call cba_xeh_fnc_animDone"; \
 animStateChanged = "call cba_xeh_fnc_animStateChanged"; \
+assembled = "call cba_xeh_fnc_assembled"; \
+attached = "call cba_xeh_fnc_attached"; \
 cargoLoaded = "call cba_xeh_fnc_cargoLoaded"; \
 cargoUnloaded = "call cba_xeh_fnc_cargoUnloaded"; \
 containerClosed = "call cba_xeh_fnc_containerClosed"; \
 containerOpened = "call cba_xeh_fnc_containerOpened"; \
 controlsShifted = "call cba_xeh_fnc_controlsShifted"; \
 dammaged = "call cba_xeh_fnc_dammaged"; \
 deleted = "call cba_xeh_fnc_deleted"; \
+detached = "call cba_xeh_fnc_detached"; \
 disassembled = "call cba_xeh_fnc_disassembled"; \
 engine = "call cba_xeh_fnc_engine"; \
 epeContact = "call cba_xeh_fnc_epeContact"; \
@@ -37,6 +40,7 @@ getIn = "call cba_xeh_fnc_getIn"; \
 getInMan = "call cba_xeh_fnc_getInMan"; \
 getOut = "call cba_xeh_fnc_getOut"; \
 getOutMan = "call cba_xeh_fnc_getOutMan"; \
+handleHeal = "call cba_xeh_fnc_handleHeal"; \
 hit = "call cba_xeh_fnc_hit"; \
 hitPart = "call cba_xeh_fnc_hitPart"; \
 incomingMissile = "call cba_xeh_fnc_incomingMissile"; \
@@ -45,7 +49,9 @@ inventoryOpened = "call cba_xeh_fnc_inventoryOpened"; \
 killed = "call cba_xeh_fnc_killed"; \
 landedTouchDown = "call cba_xeh_fnc_landedTouchDown"; \
 landedStopped = "call cba_xeh_fnc_landedStopped"; \
+leaningChanged = "call cba_xeh_fnc_leaningChanged"; \
 local = "call cba_xeh_fnc_local"; \
+magazineReloading = "call cba_xeh_fnc_magazineReloading"; \
 opticsModeChanged = "call cba_xeh_fnc_opticsModeChanged"; \
 opticsSwitch = "call cba_xeh_fnc_opticsSwitch"; \
 put = "call cba_xeh_fnc_put"; \
@@ -63,6 +69,7 @@ turnIn = "call cba_xeh_fnc_turnIn"; \
 turnOut = "call cba_xeh_fnc_turnOut"; \
 visionModeChanged = "call cba_xeh_fnc_visionModeChanged"; \
 weaponAssembled = "call cba_xeh_fnc_weaponAssembled"; \
+weaponChanged = "call cba_xeh_fnc_weaponChanged"; \
 weaponDisassembled = "call cba_xeh_fnc_weaponDisassembled"; \
 weaponDeployed = "call cba_xeh_fnc_weaponDeployed"; \
 weaponRested = "call cba_xeh_fnc_weaponRested";
@@ -79,13 +86,16 @@ fired = ""; \
 animChanged = ""; \
 animDone = ""; \
 animStateChanged = ""; \
+assembled = ""; \
+attached = ""; \
 cargoLoaded = ""; \
 cargoUnloaded = ""; \
 containerClosed = ""; \
 containerOpened = ""; \
 controlsShifted = ""; \
 dammaged = ""; \
 deleted = ""; \
+detached = ""; \
 disassembled = ""; \
 engine = ""; \
 epeContact = ""; \
@@ -102,6 +112,7 @@ getIn = ""; \
 getInMan = ""; \
 getOut = ""; \
 getOutMan = ""; \
+handleHeal = ""; \
 hit = ""; \
 hitPart = ""; \
 incomingMissile = ""; \
@@ -110,7 +121,9 @@ inventoryOpened = ""; \
 killed = ""; \
 landedTouchDown = ""; \
 landedStopped = ""; \
+leaningChanged = ""; \
 local = ""; \
+magazineReloading = ""; \
 opticsModeChanged = ""; \
 opticsSwitch = ""; \
 put = ""; \
@@ -127,6 +140,7 @@ turnIn = ""; \
 turnOut = ""; \
 visionModeChanged = ""; \
 weaponAssembled = ""; \
+weaponChanged = ""; \
 weaponDisassembled = ""; \
 weaponDeployed = ""; \
 weaponRested = "";
diff --git a/include/z/ace/addons/main/script_debug.hpp b/include/z/ace/addons/main/script_debug.hpp
@@ -5,7 +5,7 @@ Fast Recompiling via function
 // To Use: [] call ACE_PREP_RECOMPILE;
 
 #ifdef DISABLE_COMPILE_CACHE
-    #define LINKFUNC(x) {_this call FUNC(x)}
+    #define LINKFUNC(x) {call FUNC(x)}
     #define PREP_RECOMPILE_START    if (isNil "ACE_PREP_RECOMPILE") then {ACE_RECOMPILES = []; ACE_PREP_RECOMPILE = {{call _x} forEach ACE_RECOMPILES;}}; private _recomp = {
     #define PREP_RECOMPILE_END      }; call _recomp; ACE_RECOMPILES pushBack _recomp;
 #else
@@ -43,7 +43,7 @@ PERFORMANCE COUNTERS SECTION
 // To Use: [] call ace_common_fnc_dumpPerformanceCounters;
 
 #ifdef ENABLE_PERFORMANCE_COUNTERS
-    #define CBA_fnc_addPerFrameHandler { _ret = [(_this select 0), (_this select 1), (_this select 2), #function] call CBA_fnc_addPerFrameHandler; if(isNil "ACE_PFH_COUNTER" ) then { ACE_PFH_COUNTER=[]; }; ACE_PFH_COUNTER pushBack [[_ret, __FILE__, __LINE__], [(_this select 0), (_this select 1), (_this select 2)]];  _ret }
+    #define CBA_fnc_addPerFrameHandler { private _ret = call CBA_fnc_addPerFrameHandler; if(isNil "ACE_PFH_COUNTER" ) then { ACE_PFH_COUNTER=[]; }; ACE_PFH_COUNTER pushBack [[_ret, __FILE__, __LINE__], _this];  _ret }
 
     #define CREATE_COUNTER(x) if(isNil "ACE_COUNTERS" ) then { ACE_COUNTERS=[]; }; GVAR(DOUBLES(x,counter))=[]; GVAR(DOUBLES(x,counter)) set[0, QUOTE(GVAR(DOUBLES(x,counter)))];  GVAR(DOUBLES(x,counter)) set[1, diag_tickTime]; ACE_COUNTERS pushBack GVAR(DOUBLES(x,counter));
     #define BEGIN_COUNTER(x) if(isNil QUOTE(GVAR(DOUBLES(x,counter)))) then { CREATE_COUNTER(x) }; GVAR(DOUBLES(x,counter)) set[2, diag_tickTime];

diff --git a/include/z/ace/addons/main/script_mod.hpp b/include/z/ace/addons/main/script_mod.hpp
@@ -10,8 +10,8 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.14
-#define REQUIRED_CBA_VERSION {3,16,0}
+#define REQUIRED_VERSION 2.18
+#define REQUIRED_CBA_VERSION {3,18,0}
 
 #ifndef COMPONENT_BEAUTIFIED
     #define COMPONENT_BEAUTIFIED COMPONENT