[WIP] Missionhandler

.vscode/settings.json

@@ -30,5 +30,7 @@
     "editor.detectIndentation": false,
     "files.autoSave": "afterDelay",
     "files.autoSaveDelay": 1000,
-    "git.confirmSync": false
+    "git.confirmSync": false,
+    "sqflint.discoverDescriptionFiles": false,
+    "sqflint.descriptionFiles": ["missions/Operation_Kerberos.Altis/description.ext"]
 }

.vscode/snippets/sqf.json

@@ -15,7 +15,7 @@
             "  Return Value:",
             "    ${8:return name} <${9:TYPENAME}>",
             " ",
-            " Public: ${10|Yes,No|}",
+            "  Public: ${10|Yes,No|}",
             "*/",
             "",
             "$0"

addons/artillery/functions/fnc_FireAtTarget.sqf

@@ -52,7 +52,7 @@ switch (typeOf _artillery) do {
             case (_distance < 13000) : {"M9"}; // 10400-13600
             case (_distance < 16000) : {"M10"}; // 12900-16800
             case (_distance < 20500) : {"M11"}; // 15700-20500
-            default {""}
+            default {""};
         };
         //TRACEV_2(_distance,_mode);
         CHECK(_mode isEqualTo "")

addons/artillery/functions/fnc_calcMuzzleSpeed.sqf

@@ -14,7 +14,7 @@
 //#define DEBUG_MODE_FULL
 #include "script_component.hpp"
 
-params ["_barrellenght","_pressure","_mass"];
+params ["_barrellenght","_pressure","_mass", "_projectilemass", "_crossSectionArea"];
 
 private _q = _projectilemass/_crossSectionArea;
 

addons/common/functions/fnc_getGunLenght.sqf

@@ -15,7 +15,7 @@
 //#define DEBUG_MODE_FULL
 #include "script_component.hpp"
 
-_this params params [["_vehicle", "", [objNull,""]], ["_turret", [-1], [[]]]];
+params [["_vehicle", "", [objNull,""]], ["_turret", [-1], [[]]]];
 
 CHECK(_vehicle isEqualTo "")
 

addons/composition/config/missionhouses.hpp

@@ -140,7 +140,7 @@ class generic_Land_Metal_Shed_F_01 {
 
 class laptop_Land_i_House_Small_01_V2_F_laptop_01 {
     type = "upload";
-    objecttypes = {"Land_Laptop_unfolded_F"};
+    objecttypes[] = {"Land_Laptop_unfolded_F"};
     class header {
         #include "missionhouses\laptop_Land_i_House_Small_01_V2_F_laptop_01\header.sqe"
     };
@@ -191,7 +191,7 @@ class Outpost_V4 {
 
 class pow_Land_i_Shed_Ind_F_01 {
     type = "pow";
-    objecttypes = {"C_scientist_F"};
+    objecttypes[] = {"C_scientist_F"};
     class header {
         #include "missionhouses\pow_Land_i_Shed_Ind_F_01\header.sqe"
     };

addons/composition/functions/fnc_getCfgDataType.sqf

@@ -13,8 +13,14 @@
 
 #include "script_component.hpp"
 
-params ["_cfg","_datatype"];
+params [["_cfg", configNull, [configNull]], "_datatype"];
 //TRACEV_2(_cfg,_datatype);
+
+If (isNull _cfg) exitWith {
+    ERROR_1("No Config provided: %1",_cfg);
+    []
+};
+
 _dataType = toLower _datatype;
 
 private _return = [];

addons/database/XEH_PREINIT.sqf

@@ -17,5 +17,9 @@ If (!isServer) exitWith {};
 
 GVAR(initialized) = false;
 
+if !(isClass (configFile >> "CfgPatches" >> "extDB3")) exitWith {
+    ERROR("ExtDB3 Mod is not loaded");
+};
+
 call FUNC(connectToDB);
 ["constructTablePlayers"] call FUNC(sendNoReturn);

addons/database/config.cpp

@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"dorb_common","extDB3"};
+        requiredAddons[] = {"dorb_common"};
         author = ECSTRING(main,BrigTeam);
         authors[] = {"Dorbedo"};
         url = ECSTRING(main,URL);

addons/database/functions/fnc_bigData.sqf

@@ -13,7 +13,7 @@
  */
 #include "script_component.hpp"
 
-_this params ["_key"];
+params ["_key"];
 private _return = "";
 private "_pipe";
 while {true} do {

addons/database/functions/fnc_connectToDB.sqf

@@ -14,6 +14,7 @@
 #define DEBUG_MODE_NORMAL
 #include "script_component.hpp"
 
+if !(isClass (configFile >> "CfgPatches" >> "extDB3")) exitWith {};
 
 private _result = "extdb3" callExtension "9:VERSION";
 If (_result isEqualTo "") exitWith {

addons/database/functions/fnc_getSingleValue.sqf

@@ -13,9 +13,9 @@
  */
 #include "script_component.hpp"
 
-CHECK(isNil "_this")
+If (isNil "_this") exitWith {};
 
-private _query = [0,GVAR(sessionID)];
+private _query = [0, GVAR(sessionID)];
 _query append _this;
 _query = _query joinString ":";
 private _return = call compile ("extdb3" callExtension _query);

addons/database/functions/fnc_getValue.sqf

@@ -13,9 +13,9 @@
  */
 #include "script_component.hpp"
 
-CHECK(isNil "_this")
+If (isNil "_this") exitWith {};
 
-private _query = [0,GVAR(sessionID)];
+private _query = [0, GVAR(sessionID)];
 _query append _this;
 _query = _query joinString ":";
 private _return = call compile ("extdb3" callExtension _query);

addons/database/functions/fnc_sendNoReturn.sqf

@@ -14,9 +14,9 @@
  */
 #include "script_component.hpp"
 
-CHECK(isNil "_this")
+If (isNil "_this") exitWith {};
 
-private _query = [1,GVAR(sessionID)];
+private _query = [1, GVAR(sessionID)];
 _query append _this;
 _query = _query joinString ":";
 "extdb3" callExtension _query;

addons/database/functions/fnc_sendWithReturn.sqf

@@ -13,9 +13,9 @@
  */
 #include "script_component.hpp"
 
-CHECK(isNil "_this")
+If (isNil "_this") exitWith {};
 
-private _query = [0,GVAR(sessionID)];
+private _query = [0, GVAR(sessionID)];
 _query append _this;
 _query = _query joinString ":";
 private _return = call compile ("extdb3" callExtension _query);

addons/headless/XEH_preInit.sqf

@@ -11,21 +11,23 @@ RECOMPILE_START;
 #include "XEH_PREP.hpp"
 RECOMPILE_END;
 
+ADDON = true;
+
 GVAR(enabled) = true;
 GVAR(delay) = HEADLESSDELAY;
 GVAR(log) = true;
 
+if (isClass(configFile >> "CfgPatches" >> "acex_headless")) exitWith {
+    GVAR(enabled) = false;
+};
+
 if (isServer) then {
     GVAR(headlessClients) = [];
     GVAR(inRebalance) = false;
     GVAR(endMissionCheckDelayed) = false;
     [QGVAR(headlessClientJoined), FUNC(handleConnectHC)] call CBA_fnc_addEventHandler;
 };
 
-
-ADDON = true;
-
-
 ["cba_settingsInitialized", {
     // Register and remove HCs if not client that is not server and distribution or end mission enabled
     if (((!hasInterface) || isServer) && {GVAR(enabled)}) then {

addons/headless/functions/fnc_handleSpawn.sqf

@@ -18,7 +18,7 @@
 #include "script_component.hpp"
 
 params ["_object"];
-TRACE_1("Spawn",_object);
+//TRACE_1("Spawn",_object);
 
 // Exit if HC transferring disabled or object not a unit (including unit inside vehicle) or is player
 if (!(_object in allUnits) || {isPlayer _object}) exitWith {};

addons/headquarter/config/statemachines.hpp

@@ -57,7 +57,7 @@ class GVAR(statemachine_AIGroups) {
             condition = QUOTE((_this getVariable [ARR_2('GVAR(state)','none')])=='cas_support');
             onTransition = "";
         };
-        class toCAS {
+        class toCASBomb {
             targetState = "cas_support_bomb";
             condition = QUOTE((_this getVariable [ARR_2('GVAR(state)','none')])=='cas_support_bomb');
             onTransition = "";

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 1
-#define MINOR 24
-#define PATCHLVL 3
-#define BUILD 77
+#define MINOR 26
+#define PATCHLVL 0
+#define BUILD 99

addons/missionhandler/$PBOPREFIX$

@@ -0,0 +1 @@
+x\dorb\addons\artillery

addons/missionhandler/CfgEventHandlers.hpp

@@ -0,0 +1,5 @@
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_PREINIT));
+    };
+};

addons/missionhandler/XEH_PREINIT.sqf

@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+#include "XEH_PREP.hpp"
+
+ADDON = true;
+
+GVAR(rescuepoints) = [];
+
+If ((getMarkerPos "rescuepoint_west") isEqualTo [0, 0, 0]) then {
+    ["rescuepoint_west", west] call FUNC(rescuepoint_add);
+};
+If ((getMarkerPos "rescuepoint_east") isEqualTo [0, 0, 0]) then {
+    ["rescuepoint_east", east] call FUNC(rescuepoint_add);
+};
+If ((getMarkerPos "rescuepoint_independent") isEqualTo [0, 0, 0]) then {
+    ["rescuepoint_independent", independent] call FUNC(rescuepoint_add);
+};

addons/missionhandler/config.cpp

@@ -0,0 +1,17 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"dorb_common"};
+        author = ECSTRING(main,BrigTeam);
+        authors[] = {"Dorbedo"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventhandlers.hpp"