From 878bdadbb332e3e36a356526fd40b8a9fb7624ac Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Mon, 13 Apr 2015 00:46:45 -0500
Subject: [PATCH] Switch clientInit to postInit

---
 addons/interaction/XEH_clientInit.sqf | 76 ---------------------------
 addons/interaction/XEH_postInit.sqf   |  6 +++
 2 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 addons/interaction/XEH_clientInit.sqf

diff --git a/addons/interaction/XEH_clientInit.sqf b/addons/interaction/XEH_clientInit.sqf
deleted file mode 100644
index d252cd6aa1..0000000000
--- a/addons/interaction/XEH_clientInit.sqf
+++ /dev/null
@@ -1,76 +0,0 @@
-// by commy2 and esteldunedain
-
-#include "script_component.hpp"
-
-ACE_Modifier = 0;
-
-//SelectLeader Event Handler for BecomeLeader action:
-[QGVAR(selectLeader), {
-    PARAMS_2(_group,_leader);
-    _group selectLeader _leader;
-}] call  EFUNC(common,addEventHandler);
-
-if (!hasInterface) exitWith {};
-
-GVAR(isOpeningDoor) = false;
-
-// restore global fire teams for JIP
-{
-    _team = _x getVariable [QGVAR(assignedFireTeam), ""];
-    if (_team != "") then {_x assignTeam _team};
-} forEach allUnits;
-
-
-// Add keybinds
-["ACE3", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
-{
-    // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
-    // Conditions: specific
-    if (GVAR(isOpeningDoor) || {[2] call FUNC(getDoor) select 1 == ''}) exitWith {false};
-
-    // Statement
-    call EFUNC(interaction,openDoor);
-    true
-},
-{
-    //Probably don't want any condidtions here, so variable never gets locked down
-    // Statement
-    GVAR(isOpeningDoor) = false;
-    true
-},
-[57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space
-
-
-["ACE3", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder",
-{
-    // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
-    // Conditions: specific
-    if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
-
-    // Statement
-    [ACE_player, cursorTarget] call FUNC(tapShoulder);
-    true
-},
-{false},
-[20, [true, false, false]], false] call cba_fnc_addKeybind;
-
-["ACE3", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey",
-{
-    // Conditions: canInteract
-    //if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false};   // not needed
-
-    // Statement
-    ACE_Modifier = 1;
-    // Return false so it doesn't block other actions
-    false
-},
-{
-    //Probably don't want any condidtions here, so variable never gets locked down
-    ACE_Modifier = 0;
-    false;
-},
-[29, [false, false, false]], false] call cba_fnc_addKeybind;
-
-["isNotSwimming", {!underwater (_this select 0)}] call EFUNC(common,addCanInteractWithCondition);
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index 1ed3883f02..98b1cc1523 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -4,6 +4,12 @@
 
 ACE_Modifier = 0;
 
+//SelectLeader Event Handler for BecomeLeader action:
+[QGVAR(selectLeader), {
+    PARAMS_2(_group,_leader);
+    _group selectLeader _leader;
+}] call EFUNC(common,addEventHandler);
+
 if (!hasInterface) exitWith {};
 
 GVAR(isOpeningDoor) = false;