Hostage PreInit, Ace Actions

PiZZAD0X · Aug 31, 2019 · c15cd2a · c15cd2a
1 parent a5d3881
commit c15cd2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/addons/hostage/CfgEventHandlers.hpp b/addons/hostage/CfgEventHandlers.hpp
@@ -8,5 +8,14 @@ class Extended_PreStart_EventHandlers {
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        clientinit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
+    };
+};
+
+class Extended_InitPost_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            init = QUOTE(call FUNC(InitPost));
+        };
     };
 };
diff --git a/addons/hostage/XEH_preClientInit.sqf b/addons/hostage/XEH_preClientInit.sqf
@@ -4,16 +4,14 @@
     params ["_unit"];
     private _condition = {
         params ["_target", "_player"];
-        LOG_2("_statement %1, %2",_target,_player);
-        (!(GETVAR((_this select 0),IsRescued,false))
-        && !(GETVAR((_this select 0),IsUntied,false))
-        && {(alive (_this select 0))})
+        (!(GETVAR(_target,IsRescued,false))
+        && {!(GETVAR(_target,IsUntied,false))}
+        && {(alive _target)})
     };
     private _statement = {
         params ["_target", "_player"];
-        LOG_2("_statement %1, %2",_target,_player);
         [_target,_player] call FUNC(Rescue);
     };
-    private _rescueaction = ["RescueHostage", "Rescue Hostage","",_statement,_condition] call ace_interact_menu_fnc_createAction;
+    private _rescueaction = ["RescueHostage", "Untie Hostage","",_statement,_condition] call ace_interact_menu_fnc_createAction;
     [_unit, 0, ["ACE_MainActions"], _rescueaction] call ace_interact_menu_fnc_addActionToObject;
 }] call CBA_fnc_addEventHandler;