Merge pull request #10 from acemod/newEvents

Update to new CBA event system
acemod · Jun 9, 2016 · 547c3e9 · 547c3e9
2 parents 71f9e40 + 2bc4518
commit 547c3e9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/addons/headless/XEH_postInit.sqf b/addons/headless/XEH_postInit.sqf
@@ -3,14 +3,14 @@
 // Exit on player clients that are not hosts
 if (hasInterface && !isServer) exitWith {};
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     if (isServer) then {
         // Add disconnect EH if HC transferring enabled
         if (GVAR(Enabled)) then {
             addMissionEventHandler ["HandleDisconnect", {_this call FUNC(handleDisconnect)}];
         };
     } else {
         // Register HC (this part happens on HC only)
-        ["ACE_HeadlessClientJoined", [player]] call ACEFUNC(common,globalEvent);
+        [QGVAR(headlessClientJoined), [player]] call CBA_fnc_globalEvent;
     };
-}] call ACEFUNC(common,addEventHandler);
+}] call CBA_fnc_addEventHandler;
diff --git a/addons/headless/XEH_preInit.sqf b/addons/headless/XEH_preInit.sqf
@@ -7,7 +7,7 @@ ADDON = false;
 if (isServer) then {
     GVAR(headlessClients) = [];
     GVAR(inRebalance) = false;
-    ["ACE_HeadlessClientJoined", FUNC(handleConnectHC)] call ACEFUNC(common,addEventHandler);
+    [QGVAR(headlessClientJoined), FUNC(handleConnectHC)] call CBA_fnc_addEventHandler;
 };
 
 ADDON = true;
diff --git a/addons/headless/config.cpp b/addons/headless/config.cpp
@@ -16,3 +16,7 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
+
+class ACE_newEvents {
+    ACE_HeadlessClientJoined = QGVAR(headlessClientJoined);
+};
diff --git a/addons/headless/functions/fnc_rebalance.sqf b/addons/headless/functions/fnc_rebalance.sqf
@@ -23,7 +23,7 @@ TRACE_3("Rebalance",GVAR(inRebalance),GVAR(headlessClients),_force);
 if (GVAR(inRebalance) || {GVAR(headlessClients) isEqualTo []}) exitWith {};
 
 // Transfer after rebalance delay
-[FUNC(transferGroups), [_force], GVAR(Delay)] call ACEFUNC(common,waitAndExecute);
+[FUNC(transferGroups), [_force], GVAR(Delay)] call CBA_fnc_waitAndExecute;
 
 // Currently in rebalance flag
 GVAR(inRebalance) = true;
diff --git a/addons/sitting/XEH_clientInit.sqf b/addons/sitting/XEH_clientInit.sqf
@@ -15,15 +15,15 @@ DFUNC(onInitEvent) = {
     ["isNotSitting", {isNil {(_this select 0) getVariable QGVAR(isSitting)}}] call ACEFUNC(common,addCanInteractWithCondition);
 
     // Handle interruptions
-    ["medical_onUnconscious", {_this call DFUNC(handleInterrupt)}] call ACEFUNC(common,addEventhandler);
-    ["SetHandcuffed", {_this call DFUNC(handleInterrupt)}] call ACEFUNC(common,addEventhandler);
+    ["ace_unconscious", {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler;
+    ["ace_captives_SetHandcuffed", {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler;
 };
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     call FUNC(onInitEvent);
-}] call ACEFUNC(common,addEventHandler);
+}] call CBA_fnc_addEventHandler;
 
-["SettingChanged", {
+["ace_settingChanged", {
     params ["_name", "_value", "_force"];
     call FUNC(onInitEvent);
-}] call ACEFUNC(common,addEventhandler);
+}] call CBA_fnc_addEventHandler;
diff --git a/addons/viewrestriction/XEH_clientInit.sqf b/addons/viewrestriction/XEH_clientInit.sqf
@@ -3,7 +3,7 @@
 // Exit on Headless Client
 if !(hasInterface) exitWith {};
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     // Exit if module is disabled
     if (GVAR(mode) == 0) exitWith {};
 
@@ -24,14 +24,14 @@ if !(hasInterface) exitWith {};
     };
 
     // Add Event Handler for changing camera - also happens on spawn
-    ["cameraViewChanged", {
+    ["ace_cameraViewChanged", {
         call FUNC(changeCamera);
-    }] call ACEFUNC(common,addEventHandler);
+    }] call CBA_fnc_addEventHandler;
 
     // Add Event Hander for exiting and entering a vehicle when on Selective mode
     if (GVAR(mode) == 3) then {
-        ["playerVehicleChanged", {
+        ["ace_playerVehicleChanged", {
             call FUNC(changeCamera);
-        }] call ACEFUNC(common,addEventHandler);
+        }] call CBA_fnc_addEventHandler;
     };
-}] call ACEFUNC(common,addEventHandler);
+}] call CBA_fnc_addEventHandler;