Medical - Add self interaction when needed (#6912)

* Medical - Add self interaction when needed * Update addons/medical_gui/XEH_postInit.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * Update addons/medical_gui/XEH_postInit.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
acemod · Apr 1, 2019 · b907c9d · b907c9d
1 parent 978049e
commit b907c9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/addons/medical_gui/XEH_postInit.sqf b/addons/medical_gui/XEH_postInit.sqf
@@ -12,9 +12,19 @@ GVAR(pendingReopen) = false;
 
 GVAR(menuPFH) = -1;
 
+GVAR(selfInteractionActions) = [];
 [] call FUNC(addTreatmentActions);
 [] call FUNC(collectActions);
 
+[QEGVAR(interact_menu,newControllableObject), {
+    params ["_type"]; // string of the object's classname
+    if (!(_type isKindOf "CAManBase")) exitWith {};
+    {
+        _x set [0, _type];
+        _x call EFUNC(interact_menu,addActionToClass);
+    } forEach GVAR(selfInteractionActions);
+}] call CBA_fnc_addEventHandler;
+
 ["ace_treatmentSucceded", {
     if (GVAR(openAfterTreatment) && {GVAR(pendingReopen)}) then {
         GVAR(pendingReopen) = false;

diff --git a/addons/medical_gui/functions/fnc_addTreatmentActions.sqf b/addons/medical_gui/functions/fnc_addTreatmentActions.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [] call ace_medical_gui_fnc_addInteractActions
+ * [] call ace_medical_gui_fnc_addTreatmentActions
  *
  * Public: No
  */
@@ -60,6 +60,6 @@ private _fnc_condition = {
 
         ["CAManBase", 0, [_actionPath], _action, true] call EFUNC(interact_menu,addActionToClass);
         ["CAManBase", 0, ["ACE_MainActions", "ACE_Medical_Radial", _actionPath], _action, true] call EFUNC(interact_menu,addActionToClass);
-        ["CAManBase", 1, ["ACE_SelfActions", "ACE_Medical", _actionPath], _action, true] call EFUNC(interact_menu,addActionToClass);
+        GVAR(selfInteractionActions) pushBack ["", 1, ["ACE_SelfActions", "ACE_Medical", _actionPath], _action];
     } forEach _allowedBodyParts;
 } forEach configProperties [_actionsConfig, "isClass _x"];