From 77dc50f10f40406568d4b6fbe8c200db80866049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= <nicolas.d.badano@gmail.com>
Date: Tue, 24 Mar 2015 16:06:03 -0300
Subject: [PATCH] Some more fixes for self interaction inside vehicles

---
 addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf | 2 +-
 addons/interaction/CfgVehicles.hpp                           | 3 +--
 addons/medical/CfgVehicles.hpp                               | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
index eccf1a6c76..195d741761 100644
--- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
@@ -90,7 +90,7 @@ _actions = [
                 // Dummy statement so it's not collapsed when there's no available actions
                 true
             },
-            {[ACE_player, objNull, ["isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)},
+            {[ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)},
             {},
             [],
             "Spine3",
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 27b46871b7..02dd078a2b 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -391,13 +391,12 @@ class CfgVehicles {
       class ACE_Equipment {
         displayName = "$STR_ACE_Interaction_Equipment";
         condition = QUOTE(true);
-        exceptions[] = {"isNotInside"};
+        exceptions[] = {"isNotInside","notOnMap"};
         statement = "";
         showDisabled = 1;
         priority = 4.5;
         icon = "";  // @todo
         hotkey = "E";
-        exceptions[] = {"notOnMap"};
       };
     };
   };
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 2f7e309fa1..d29b1427ed 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -423,7 +423,6 @@ class CfgVehicles {
                     displayName = "$STR_ACE_Interaction_Torso";
                     distance = 5.0;
                     condition = "true";
-                    exceptions[] = {"isNotInside"};
                     runOnHover = 1;
                     exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation));