Removed callback handler, added XEH stuff to main addon

addons/main/CfgEventHandlers.hpp

@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class armatak_main {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};

addons/main/CfgFunctions.hpp

@@ -1,9 +1,6 @@
 class CfgFunctions {
 	class armatak {
 		class functions {
-			class handleCallbacks {
-				file = "\armatak\armatak\addons\main\functions\fn_handleCallbacks.sqf";
-			};
 			class init {
 				file = "\armatak\armatak\addons\main\functions\fn_init.sqf";
 			};
@@ -13,9 +10,6 @@ class CfgFunctions {
 			class video_init {
 				file = "\armatak\armatak\addons\main\functions\fn_video_init.sqf";
 			};
-			class notify {
-				file = "\armatak\armatak\addons\main\functions\fnc_notify.sqf";
-			};
 			class send_digital_pointer_cot {
 				file = "\armatak\armatak\addons\main\functions\api\fn_send_digital_pointer_cot.sqf";
 			};

addons/main/XEH_PREP.hpp

@@ -0,0 +1 @@
+PREP(notify)

addons/main/XEH_postInit.sqf

@@ -0,0 +1,29 @@
+waitUntil { !isNil "BIS_fnc_init" };
+
+addMissionEventHandler ["ExtensionCallback", {
+	params ["_name", "_function", "_data"];
+
+	if (_name == "armatak_websocket") then {
+		[_function, "success", _name] call armatak_main_fnc_notify;
+	};
+
+	if (_name == "armatak_websocket_error") then {
+		[_function, "error", _name] call armatak_main_fnc_notify;
+	};
+
+	if (_name == "armatak_tcp_socket") then {
+		[_function, "success", _name] call armatak_main_fnc_notify;
+	};
+
+	if (_name == "armatak_tcp_socket_error") then {
+		[_function, "error", _name] call armatak_main_fnc_notify;
+	};
+
+	if (_name == "armatak_video") then {
+		[_function, "success", _name] call armatak_main_fnc_notify;
+	};
+
+	if (_name == "armatak_video_error") then {
+		[_function, "error", _name] call armatak_main_fnc_notify;
+	};
+}];

addons/main/XEH_preInit.sqf

@@ -0,0 +1,9 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+ADDON = true;

addons/main/XEH_preStart.sqf

@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"

addons/main/config.cpp

@@ -37,12 +37,7 @@ class CfgMods {
     };
 };
 
-class Extended_PostInit_EventHandlers {
-    class armatak_main {
-        init = "call compileScript ['\armatak\armatak\armatak_main\initPlayerLocal.sqf']";
-    };
-};
-
+#include "CfgEventHandlers.hpp"
 #include "CfgFunctions.hpp"
 #include "CfgVehicles.hpp"
 #include "Cfg3den.hpp"

addons/main/functions/fn_handleCallbacks.sqf

@@ -1,19 +0,0 @@
-addMissionEventHandler ["ExtensionCallback", {
-	params ["_name", "_function", "_data"];
-
-	if (_name == "armatak_tcp_socket") then {
-		[_function, "success", _name] call armatak_fnc_notify;
-	};
-
-	if (_name == "armatak_tcp_socket_error") then {
-		[_function, "error", _name] call armatak_fnc_notify;
-	};
-
-	if (_name == "armatak_video") then {
-		[_function, "success", _name] call armatak_fnc_notify;
-	};
-
-	if (_name == "armatak_video_error") then {
-		[_function, "error", _name] call armatak_fnc_notify;
-	};
-}];

addons/main/functions/fn_init.sqf

@@ -17,8 +17,6 @@ if (isServer) exitWith {
 	missionNamespace setVariable ["armatak_tcp_socket_is_running", true];
 	missionNamespace setVariable ["armatak_group_colors", ["White", "Yellow", "Orange", "Magenta", "Red", "Maroon", "Purple", "DarkBlue", "Blue", "Cyan", "Teal", "Green", "DarkGreen", "Brown"]];
 
-	call armatak_fnc_handleCallbacks;
-
 	"armatak" callExtension ["tcp_socket:start", [_tak_server_fulladdress]];
 
 	_syncUnits = synchronizedObjects _logic;

addons/main/script_mod.hpp

@@ -28,5 +28,5 @@
 
 #define EXTENSION_NAME QUOTE(armatak)
 
-#define CALLEXT(var) EXTENSION_NAME callExtension [var]
+#define CALLEXT(var) EXTENSION_NAME callExtension [QUOTE(var),[]]
 #define CALLEXTP(var1, var2) EXTENSION_NAME callExtension [QUOTE(var1), var2] select 0