Add support for building with HEMTT v1.0+

.gitignore

@@ -1,11 +1,9 @@
 release/*
 releases/*
 keys/*
+.hemttout
 hemtt
 hemtt.exe
-tools/hemtt*.tar.gz*
-tools/hemtt*.zip*
-.hemtt/local
 *.cache
 *.pbo
 texHeaders.bin

hemtt.toml → .hemtt/project.toml

@@ -3,21 +3,38 @@ name = "CBA_A3"
 prefix = "cba"
 author = "CBATeam"
 mainprefix = "x"
-files = [
-    "mod.cpp",
-    "README.md",
-    "LICENSE.md",
-    "logo_cba_ca.paa",
-    "meta.cpp",
-    "userconfig"
-]
 
-version = "3.15.1"
 
 modname = "{{name}}"
 key_name = "{{prefix}}_{{version}}"
 authority = "{{prefix}}_{{version}}-{{git \"id 8\"}}"
 
+
+
+[asc]
+enabled = true
+exclude = [
+        "\\initsettings.sqf",
+        "\\initkeybinds.sqf",
+        "\\xeh_prep.sqf",
+        "\\backwards_comp.sqf",
+        "settings\\gui_createcategory.sqf",
+        "diagnostic\\fnc_isdebugconsoleallowed.sqf",
+        "xeh\\fnc_initdisplay.sqf",
+        "xeh\\fnc_startloadingscreen.sqf",
+        "xeh\\fnc_endloadingscreen.sqf"
+]
+
+
+
+
+
+
+
+
+
+
+
 check = [
     "!version_set"
 ]

addons/common/fnc_switchPlayer.sqf

@@ -43,13 +43,13 @@ _dummyUnit = (_ar select 4) createUnit [_type, [0, 0, 0], [], 0, "NONE"]; // Joi
 if (isNull _dummyUnit) exitWith { hint "Sorry, something went wrong, dummyUnit is null" };
 [_oldUnit] join _dummyGroup;
 
-LOG(format["1.Dummy created, State saved and put oldUnit in new group: %1", _dummyGroup]);
+// LOG(format["1.Dummy created, State saved and put oldUnit in new group: %1", _dummyGroup]);
 
 private _newUnit = _dummyGroup createUnit [_type, _ar select 5, [], 0, "NONE"];
 
 if (isNull _newUnit) exitWith { hint "Sorry, something went wrong, newUnit is null" };
 
-LOG(format["2.New unit created, local: %1", local _newUnit]);
+// LOG(format["2.New unit created, local: %1", local _newUnit]);
 sleep 1;
 
 addSwitchableUnit _newUnit;
@@ -58,7 +58,7 @@ selectPlayer _newUnit;
 _newUnit setRank (_ar select 2);
 _newUnit addScore (_ar select 3);
 
-LOG(format["3.State transfered, switched player control to new unit, local: %1", local _newUnit]);
+// LOG(format["3.State transfered, switched player control to new unit, local: %1", local _newUnit]);
 sleep 1;
 if (_ar select 7 != "") then
 {

addons/diagnostic/CfgDisplay3DEN.hpp

@@ -5,13 +5,13 @@ class Display3DEN {
         class MenuStrip: ctrlMenuStrip {
             class Items {
                 class DebugConsole {
-                    shortcuts[] = {INPUT_CTRL_OFFSET + DIK_D};
+                    shortcuts[] = {QUOTE(INPUT_CTRL_OFFSET + DIK_D)};
                 };
                 class FunctionsViewer {
-                    shortcuts[] = {INPUT_ALT_OFFSET + DIK_F};
+                    shortcuts[] = {QUOTE(INPUT_ALT_OFFSET + DIK_F)};
                 };
                 class ConfigViewer {
-                    shortcuts[] = {INPUT_ALT_OFFSET + DIK_G};
+                    shortcuts[] = {QUOTE(INPUT_ALT_OFFSET + DIK_G)};
                 };
             };
         };

addons/diagnostic/CfgFunctions.hpp

@@ -19,7 +19,7 @@ class CfgFunctions {
     class A3 {
         class Debug {
             class isDebugConsoleAllowed {
-                file = PATHTOF(fnc_isDebugConsoleAllowed.sqf);
+                file = QPATHTOF(fnc_isDebugConsoleAllowed.sqf);
             };
         };
     };

addons/diagnostic/gui.hpp

@@ -13,11 +13,11 @@ class RscTitles {
                 onLoad = QUOTE(uiNamespace setVariable [ARR_2('GVAR(Error)',_this select 0)]);
                 idc = -1;
                 font = "RobotoCondensedBold";
-                sizeEx = 0.55 * GUI_GRID_CENTER_H;
-                x =  0 * GUI_GRID_CENTER_W + GUI_GRID_CENTER_X;
-                y =  5 * GUI_GRID_CENTER_H + GUI_GRID_CENTER_Y;
-                w = 40 * GUI_GRID_CENTER_W;
-                h = 10 * GUI_GRID_CENTER_H;
+                sizeEx = QUOTE(0.55 * GUI_GRID_CENTER_H);
+                x = QUOTE( 0 * GUI_GRID_CENTER_W + GUI_GRID_CENTER_X);
+                y = QUOTE( 5 * GUI_GRID_CENTER_H + GUI_GRID_CENTER_Y);
+                w = QUOTE(40 * GUI_GRID_CENTER_W);
+                h = QUOTE(10 * GUI_GRID_CENTER_H);
                 colorBackground[] = {1,0.2,0,0.8};
             };
         };
@@ -29,22 +29,22 @@ class GVAR(watchInput): RscEdit {
     autocomplete = "scripting";
     shadow = 0;
     font = "EtelkaMonospacePro";
-    x = 0.5 * GUI_GRID_W;
-    y = 11 * GUI_GRID_H;
-    w = 21 * GUI_GRID_W;
-    h = 1 * GUI_GRID_H;
-    sizeEx = 0.7 * GUI_GRID_H;
+    x = QUOTE(0.5 * GUI_GRID_W);
+    y = QUOTE(11 * GUI_GRID_H);
+    w = QUOTE(21 * GUI_GRID_W);
+    h = QUOTE(1 * GUI_GRID_H);
+    sizeEx = QUOTE(0.7 * GUI_GRID_H);
 };
 
 class GVAR(watchOutput): RscEdit {
     lineSpacing = 1;
     style = ST_NO_RECT;
     shadow = 0;
     font = "EtelkaMonospacePro";
-    x = 0.5 * GUI_GRID_W;
-    y = 12 * GUI_GRID_H;
-    w = 21 * GUI_GRID_W;
-    h = 1 * GUI_GRID_H;
+    x = QUOTE(0.5 * GUI_GRID_W);
+    y = QUOTE(12 * GUI_GRID_H);
+    w = QUOTE(21 * GUI_GRID_W);
+    h = QUOTE(1 * GUI_GRID_H);
     colorBackground[] = {0,0,0,0.75};
-    sizeEx = 0.7 * GUI_GRID_H;
+    sizeEx = QUOTE(0.7 * GUI_GRID_H);
 };

addons/diagnostic/test_assertions.sqf

@@ -13,14 +13,14 @@ private ["_a", "_b"];
 ERROR("Testing that ERROR() is output correctly");
 _a = false;
 
-ASSERT_TRUE(_a,"Checking ASSERT_TRUE(" + str(_a) + ") outputs an error correctly");
+ASSERT_TRUE(_a,"Checking AXSSERT_TRUE(" + str(_a) + ") outputs an error correctly");
 _a = true;
 
-ASSERT_FALSE(_a,"Checking ASSERT_FALSE(" + str(_a) + ")outputs an error correctly");
+ASSERT_FALSE(_a,"Checking AXSSERT_FALSE(" + str(_a) + ")outputs an error correctly");
 _a = 1;
 _b = 2;
 
-ASSERT_OP(_a,>,_b,"Checking ASSERT_OP(1>2) outputs an error correctly");
-ASSERT_DEFINED("_imaginaryFox","Checking ASSERT_DEFINED() is output correctly");
+ASSERT_OP(_a,>,_b,"Checking AXSSERT_OP(1>2) outputs an error correctly");
+ASSERT_DEFINED("_imaginaryFox","Checking AXSSERT_DEFINED() is output correctly");
 
 nil;

addons/jr/config.cpp

@@ -1,13 +1,13 @@
 #include "script_component.hpp"
 
-#define private 0       // hidden
-#define protected 1     // hidden but usable
-#define public 2        // visible
+#define private 0
+#define protected 1
+#define public 2
 
-#define ReadAndWrite 0      //! any modifications enabled
-#define ReadAndCreate 1     //! only adding new class members is allowed
-#define ReadOnly 2          //! no modifications enabled
-#define ReadOnlyVerified 3  //! no modifications enabled, CRC test applied
+#define ReadAndWrite 0
+#define ReadAndCreate 1
+#define ReadOnly 2
+#define ReadOnlyVerified 3
 
 class CfgPatches {
     class ADDON {