Merge branch 'master' into medical-fixes

Conflicts:
	addons/medical/CfgVehicles.hpp

addons/fcs/CfgVehicles.hpp

@@ -26,7 +26,6 @@ class CfgVehicles {
         class ACE_SelfActions {
             class ResetFCS {
                 displayName = $STR_ACE_FCS_ResetFCS;
-                enableInside = 1;
                 condition = QUOTE(call FUNC(canResetFCS));
                 statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset););
                 showDisabled = 0;
@@ -40,7 +39,6 @@ class CfgVehicles {
         class ACE_SelfActions {
             class ResetFCS {
                 displayName = $STR_ACE_FCS_ResetFCS;
-                enableInside = 1;
                 condition = QUOTE(call FUNC(canResetFCS));
                 statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset););
                 showDisabled = 0;

addons/hearing/CfgVehicles.hpp

@@ -6,22 +6,22 @@ class CfgVehicles {
                 class ACE_PutInEarplugs {
                     displayName = "$STR_ACE_Hearing_EarPlugs_On";
                     condition = QUOTE( !([_player] call FUNC(hasEarPlugsIn)) && {'ACE_EarPlugs' in items _player} );
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE( [_player] call FUNC(putInEarPlugs) );
                     showDisabled = 0;
                     priority = 2.5;
                     icon = PATHTOF(UI\ACE_earplugs_x_ca.paa);
                     hotkey = "E";
-                    enableInside = 1;
                 };
                 class ACE_RemoveEarplugs {
                     displayName = "$STR_ACE_Hearing_EarPlugs_Off";
                     condition = QUOTE( [_player] call FUNC(hasEarPlugsIn) );
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE( [_player] call FUNC(removeEarPlugs) );
                     showDisabled = 0;
                     priority = 2.5;
                     icon = PATHTOF(UI\ACE_earplugs_x_ca.paa);
                     hotkey = "E";
-                    enableInside = 1;
                 };
             };
         };

addons/interact_menu/XEH_clientInit.sqf

@@ -16,11 +16,11 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
 
 
 ["ACE3", QGVAR(InteractKey), "Interact Key",
-{_this call FUNC(keyDown)},
+{[0] call FUNC(keyDown)},
-{_this call FUNC(keyUp)},
+{[0] call FUNC(keyUp)},
 [219, [false, false, false]], false] call cba_fnc_addKeybind;  //Left Windows Key
 
 ["ACE3", QGVAR(SelfInteractKey), "Self Actions Key",
-{_this call FUNC(keyDownSelfAction)},
+{[1] call FUNC(keyDown)},
-{_this call FUNC(keyUpSelfAction)},
+{[1] call FUNC(keyUp)},
 [219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg

addons/interact_menu/XEH_preInit.sqf

@@ -11,12 +11,11 @@ PREP(createAction);
 PREP(findActionNode);
 PREP(isSubPath);
 PREP(keyDown);
-PREP(keyDownSelfAction);
 PREP(keyUp);
-PREP(keyUpSelfAction);
 PREP(removeActionFromClass);
 PREP(removeActionFromObject);
 PREP(render);
+PREP(renderActionPoints);
 PREP(renderBaseMenu);
 PREP(renderIcon);
 PREP(renderMenu);
@@ -26,6 +25,7 @@ PREP(splitPath);
 GVAR(keyDown) = false;
 GVAR(keyDownSelfAction) = false;
 GVAR(keyDownTime) = 0;
+GVAR(openedMenuType) = -1;
 
 GVAR(lastTime) = diag_tickTime;
 GVAR(rotationAngle) = 0;

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",

addons/interact_menu/functions/fnc_keyDown.sqf

@@ -1,9 +1,9 @@
 /*
- * Author: NouberNou
+ * Author: NouberNou and esteldunedain
- * Handle interaction key down
+ * Handle interactions key down
  *
  * Argument:
- * None
+ * 0: Type of key: 0 interaction / 1 self interaction <NUMBER>
  *
  * Return value:
  * true <BOOL>
@@ -12,17 +12,42 @@
  */
 #include "script_component.hpp"
 
-if(!GVAR(keyDown)) then {
+EXPLODE_1_PVT(_this,_menuType);
+
+if (GVAR(openedMenuType) == _menuType) exitWith {true};
+
 while {dialog} do {
     closeDialog 0;
 };
 
-    // Only interact with others if on foot
+if (_menuType == 0) then {
-    if (vehicle ACE_player != ACE_player) exitWith {};
-
     GVAR(keyDown) = true;
-    GVAR(keyDownTime) = diag_tickTime;
+    GVAR(keyDownSelfAction) = false;
-
+} else {
-    ["interactMenuOpened", [0]] call EFUNC(common,localEvent);
+    GVAR(keyDown) = false;
+    GVAR(keyDownSelfAction) = true;
 };
+GVAR(keyDownTime) = diag_tickTime;
+GVAR(openedMenuType) = _menuType;
+
+GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) ||
+                      visibleMap ||
+                      (GVAR(AlwaysUseCursorSelfInteraction) && _menuType == 1);
+if (GVAR(useCursorMenu)) then {
+    createDialog QGVAR(cursorMenu);
+    // The dialog sets:
+    // uiNamespace getVariable QGVAR(dlgCursorMenu);
+    // uiNamespace getVariable QGVAR(cursorMenuOpened);
+    ctrlEnable [91921, true];
+    ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", {
+        GVAR(cursorPos) = [_this select 1, _this select 2, 0];
+    }];
+    setMousePosition [0.5, 0.5];
+};
+
+GVAR(selfMenuOffset) = ((positionCameraToWorld [0, 0, 2]) call EFUNC(common,positionToASL)) vectorDiff
+                       ((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL));
+
+["interactMenuOpened", [_menuType]] call EFUNC(common,localEvent);
+
 true

addons/interact_menu/functions/fnc_keyDownSelfAction.sqf

@@ -1,45 +0,0 @@
-/*
- * Author: NouberNou
- * Handle self action key down
- *
- * Argument:
- * None
- *
- * Return value:
- * true <BOOL>
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-if(!GVAR(keyDownSelfAction)) then {
-    while {dialog} do {
-        closeDialog 0;
-    };
-
-    GVAR(keyDownSelfAction) = true;
-    GVAR(keyDown) = false;
-    GVAR(keyDownTime) = diag_tickTime;
-
-    ["interactMenuOpened", [1]] call EFUNC(common,localEvent);
-
-    GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) || GVAR(AlwaysUseCursorSelfInteraction) || visibleMap;
-
-    if (GVAR(useCursorMenu)) then {
-        closeDialog 0;
-        createDialog QGVAR(cursorMenu);
-        // The dialog sets:
-        // uiNamespace getVariable QGVAR(dlgCursorMenu);
-        // uiNamespace getVariable QGVAR(cursorMenuOpened);
-        ctrlEnable [91921, true];
-        ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", {
-            GVAR(cursorPos) = [_this select 1, _this select 2, 0];
-        }];
-        setMousePosition [0.5, 0.5];
-
-    };
-
-    GVAR(selfMenuOffset) = ((positionCameraToWorld [0, 0, 2]) call EFUNC(common,positionToASL)) vectorDiff
-                           ((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL));
-};
-true

addons/interact_menu/functions/fnc_keyUp.sqf

@@ -1,9 +1,9 @@
 /*
- * Author: NouberNou
+ * Author: NouberNou and esteldunedain
- * Handle interaction key up
+ * Handle interactions key up
  *
  * Argument:
- * None
+ * 0: Type of key: 0 interaction / 1 self interaction <NUMBER>
  *
  * Return value:
  * true <BOOL>
@@ -12,6 +12,9 @@
  */
 #include "script_component.hpp"
 
+// Exit if there's no menu opened
+if (GVAR(openedMenuType) < 0) exitWith {true};
+
 if(GVAR(actionSelected)) then {
     this = GVAR(selectedTarget);
 
@@ -33,12 +36,18 @@ if(GVAR(actionSelected)) then {
     };
 };
 
-if (GVAR(keyDown)) then {
 GVAR(keyDown) = false;
-    ["interactMenuClosed", [0]] call EFUNC(common,localEvent);
+GVAR(keyDownSelfAction) = false;
+GVAR(openedMenuType) = -1;
+
+if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
+    closeDialog 0;
 };
 
 GVAR(expanded) = false;
 GVAR(lastPath) = [];
 GVAR(menuDepthPath) = [];
+
+["interactMenuClosed", [GVAR(openedMenuType)]] call EFUNC(common,localEvent);
+
 true

addons/interact_menu/functions/fnc_keyUpSelfAction.sqf

@@ -1,48 +0,0 @@
-/*
- * Author: NouberNou
- * Handle self action key up
- *
- * Argument:
- * None
- *
- * Return value:
- * true <BOOL>
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
-    closeDialog 0;
-};
-
-if(GVAR(actionSelected)) then {
-    this = GVAR(selectedTarget);
-
-    private ["_player","_target","_actionData"];
-    _player = ACE_Player;
-    _target = GVAR(selectedTarget);
-
-    // Clear the conditions caches
-    ["clearConditionCaches", []] call EFUNC(common,localEvent);
-
-    // Check the action conditions
-    _actionData = GVAR(selectedAction) select 0;
-    if ([_target, _player, _actionData select 6] call (_actionData select 4)) then {
-        // Call the statement
-        [_target, _player, _actionData select 6] call (_actionData select 3);
-
-        // Clear the conditions caches again if the action was performed
-        ["clearConditionCaches", []] call EFUNC(common,localEvent);
-    };
-};
-
-if (GVAR(keyDownSelfAction)) then {
-    GVAR(keyDownSelfAction) = false;
-    ["interactMenuClosed", [1]] call EFUNC(common,localEvent);
-};
-
-GVAR(expanded) = false;
-GVAR(lastPath) = [];
-GVAR(menuDepthPath) = [];
-true

addons/interact_menu/functions/fnc_render.sqf

@@ -19,98 +19,11 @@ _foundTarget = false;
 _cursorPos1 = positionCameraToWorld [0, 0, 0];
 _cursorPos2 = positionCameraToWorld [0, 0, 2];
 
-GVAR(selfMenuScale) = (((worldToScreen (positionCameraToWorld [1,0,2])) select 0) -
-                       ((worldToScreen (positionCameraToWorld [0,0,2])) select 0)) / 0.6;
-//systemChat format ["selfMenuScale: %1", GVAR(selfMenuScale)];
-GVAR(currentOptions) = [];
 
-private ["_actionsVarName","_classActions","_objectActions","_target","_player","_action","_actionData","_active"];
+if (GVAR(openedMenuType) >= 0) then {
-_player = ACE_player;
+    // Render all available nearby interactions
-if (GVAR(keyDown)) then {
+    call FUNC(renderActionPoints);
 
-    // Render all nearby interaction menus
-    #define MAXINTERACTOBJECTS 3
-    private ["_numInteractObjects","_numInteractions"];
-    _numInteractObjects = 0;
-
-    _nearestObjects = nearestObjects [(getPos ACE_player), ["All"], 15];
-    {
-        _target = _x;
-
-        _numInteractions = 0;
-        // Prevent interacting with yourself or your own vehicle
-        if (_target != ACE_player && {_target != vehicle ACE_player}) then {
-
-            // Iterate through object actions, find base level actions and render them if appropiate
-            _actionsVarName = format [QGVAR(Act_%1), typeOf _target];
-            GVAR(objectActionList) = _target getVariable [QGVAR(actions), []];
-            {
-                // Only render them directly if they are base level actions
-                if (count (_x select 1) == 0) then {
-                    // Try to render the menu
-                    _action = [_x,[]];
-                    if ([_target, _action] call FUNC(renderBaseMenu)) then {
-                        _numInteractions = _numInteractions + 1;
-                    };
-                };
-            } forEach GVAR(objectActionList);
-
-            // Iterate through base level class actions and render them if appropiate
-            _classActions = missionNamespace getVariable [_actionsVarName, []];
-            {
-                _action = _x;
-                // Try to render the menu
-                if ([_target, _action] call FUNC(renderBaseMenu)) then {
-                    _numInteractions = _numInteractions + 1;
-                };
-            } forEach _classActions;
-
-            // Limit the amount of objects the player can interact with
-            if (_numInteractions > 0) then {
-                _numInteractObjects = _numInteractObjects + 1;
-            };
-        };
-        if (_numInteractObjects >= MAXINTERACTOBJECTS) exitWith {};
-
-    } forEach _nearestObjects;
-
-} else {
-    if (GVAR(keyDownSelfAction)) then {
-
-        // Render only the self action menu
-        _target = vehicle ACE_player;
-
-        // Iterate through object actions, find base level actions and render them if appropiate
-        _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target];
-        GVAR(objectActionList) = _target getVariable [QGVAR(selfActions), []];
-        /*
-        {
-            _action = _x;
-            // Only render them directly if they are base level actions
-            if (count (_action select 7) == 1) then {
-                [_target, _action, 0, [180, 360]] call FUNC(renderMenu);
-            };
-        } forEach GVAR(objectActionList);
-        */
-
-        // Iterate through base level class actions and render them if appropiate
-        _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target];
-        _classActions = missionNamespace getVariable [_actionsVarName, []];
-        {
-            _action = _x;
-
-            _pos = if !(visibleMap) then {
-                (((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)) vectorAdd GVAR(selfMenuOffset)) call EFUNC(common,ASLToPosition)
-            } else {
-                [0.5, 0.5]
-            };
-            [_target, _action, _pos] call FUNC(renderBaseMenu);
-        } forEach _classActions;
-    };
-};
-
-
-if(GVAR(keyDown) || GVAR(keyDownSelfAction)) then {
     // Draw the red selector only when there's no cursor
     if !(uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
         [[0.5,0.5], "\a3\ui_f\data\IGUI\Cfg\Cursors\selected_ca.paa"] call FUNC(renderSelector);

addons/interact_menu/functions/fnc_renderActionPoints.sqf

@@ -0,0 +1,113 @@
+/*
+ * Author: NouberNou and esteldunedain
+ * Render all action points
+ *
+ * Argument:
+ * None
+ *
+ * Return value:
+ * None
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+GVAR(currentOptions) = [];
+
+private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_objectActions","_target","_player","_action","_actionData","_active"];
+_player = ACE_player;
+
+
+_fnc_renderNearbyActions = {
+    // Render all nearby interaction menus
+    #define MAXINTERACTOBJECTS 3
+
+    _numInteractObjects = 0;
+    _nearestObjects = nearestObjects [(getPos ACE_player), ["All"], 15];
+    {
+        _target = _x;
+
+        _numInteractions = 0;
+        // Prevent interacting with yourself or your own vehicle
+        if (_target != ACE_player && {_target != vehicle ACE_player}) then {
+
+            // Iterate through object actions, find base level actions and render them if appropiate
+            _actionsVarName = format [QGVAR(Act_%1), typeOf _target];
+            GVAR(objectActionList) = _target getVariable [QGVAR(actions), []];
+            {
+                // Only render them directly if they are base level actions
+                if (count (_x select 1) == 0) then {
+                    // Try to render the menu
+                    _action = [_x,[]];
+                    if ([_target, _action] call FUNC(renderBaseMenu)) then {
+                        _numInteractions = _numInteractions + 1;
+                    };
+                };
+            } forEach GVAR(objectActionList);
+
+            // Iterate through base level class actions and render them if appropiate
+            _classActions = missionNamespace getVariable [_actionsVarName, []];
+            {
+                _action = _x;
+                // Try to render the menu
+                if ([_target, _action] call FUNC(renderBaseMenu)) then {
+                    _numInteractions = _numInteractions + 1;
+                };
+            } forEach _classActions;
+
+            // Limit the amount of objects the player can interact with
+            if (_numInteractions > 0) then {
+                _numInteractObjects = _numInteractObjects + 1;
+            };
+        };
+        if (_numInteractObjects >= MAXINTERACTOBJECTS) exitWith {};
+
+    } forEach _nearestObjects;
+};
+
+
+
+_fnc_renderSelfActions = {
+    _target = _this;
+
+    // Iterate through object actions, find base level actions and render them if appropiate
+    _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target];
+    GVAR(objectActionList) = _target getVariable [QGVAR(selfActions), []];
+    /*
+    {
+        _action = _x;
+        // Only render them directly if they are base level actions
+        if (count (_action select 7) == 1) then {
+            [_target, _action, 0, [180, 360]] call FUNC(renderMenu);
+        };
+    } forEach GVAR(objectActionList);
+    */
+
+    // Iterate through base level class actions and render them if appropiate
+    _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target];
+    _classActions = missionNamespace getVariable [_actionsVarName, []];
+    {
+        _action = _x;
+
+        _pos = if !(visibleMap) then {
+            (((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)) vectorAdd GVAR(selfMenuOffset)) call EFUNC(common,ASLToPosition)
+        } else {
+            [0.5, 0.5]
+        };
+        [_target, _action, _pos] call FUNC(renderBaseMenu);
+    } forEach _classActions;
+};
+
+
+// Render nearby actions, unit self actions or vehicle self actions as appropiate
+if (GVAR(openedMenuType) == 0) then {
+
+    if (vehicle ACE_player == ACE_player) then {
+        call _fnc_renderNearbyActions;
+    } else {
+        (vehicle ACE_player) call _fnc_renderSelfActions;
+    };
+
+} else {
+    ACE_player call _fnc_renderSelfActions;
+};

addons/interact_menu/functions/fnc_renderBaseMenu.sqf

@@ -44,7 +44,7 @@ if((count _this) > 2) then {
 };
 
 // For non-self actions, exit if the action is too far away
-if (GVAR(keyDown) &&
+if (GVAR(openedMenuType) == 0 && vehicle ACE_player == ACE_player &&
     {(ACE_player modelToWorld (ACE_player selectionPosition "pilot")) distance _pos >= _distance}) exitWith {false};
 
 // Exit if the action is behind you

addons/interaction/CfgVehicles.hpp

@@ -42,7 +42,6 @@ class CfgVehicles {
           priority = 3.2;
           icon = PATHTOF(UI\team\team_management_ca.paa);
           hotkey = "M";
-          enableInside = 1;
 
           class ACE_JoinTeamRed {
             displayName = "$STR_ACE_Interaction_JoinTeamRed";
@@ -53,7 +52,6 @@ class CfgVehicles {
             icon = PATHTOF(UI\team\team_red_ca.paa);
             priority = 2.4;
             hotkey = "R";
-            enableInside = 1;
           };
           class ACE_JoinTeamGreen {
             displayName = "$STR_ACE_Interaction_JoinTeamGreen";
@@ -64,7 +62,6 @@ class CfgVehicles {
             icon = PATHTOF(UI\team\team_green_ca.paa);
             priority = 2.3;
             hotkey = "G";
-            enableInside = 1;
           };
           class ACE_JoinTeamBlue {
             displayName = "$STR_ACE_Interaction_JoinTeamBlue";
@@ -75,7 +72,6 @@ class CfgVehicles {
             icon = PATHTOF(UI\team\team_blue_ca.paa);
             priority = 2.2;
             hotkey = "B";
-            enableInside = 1;
           };
           class ACE_JoinTeamYellow {
             displayName = "$STR_ACE_Interaction_JoinTeamYellow";
@@ -86,7 +82,6 @@ class CfgVehicles {
             icon = PATHTOF(UI\team\team_yellow_ca.paa);
             priority = 2.1;
             hotkey = "Y";
-            enableInside = 1;
           };
 
           class ACE_LeaveTeam {
@@ -98,7 +93,6 @@ class CfgVehicles {
             icon = PATHTOF(UI\team\team_white_ca.paa);
             priority = 2.5;
             hotkey = "N";
-            enableInside = 1;
           };
         };
 
@@ -111,7 +105,6 @@ class CfgVehicles {
           priority = 2.6;
           icon = PATHTOF(UI\team\team_management_ca.paa);
           hotkey = "J";
-          enableInside = 1;
         };
 
         class ACE_GetDown {
@@ -137,7 +130,6 @@ class CfgVehicles {
           statement = QUOTE([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc));
           showDisabled = 0;
           priority = 2.5;
-          enableInside = 1;
         };
       };
       class ACE_Torso {
@@ -210,83 +202,83 @@ class CfgVehicles {
       class ACE_TeamManagement {
         displayName = "$STR_ACE_Interaction_TeamManagement";
         condition = QUOTE(GVAR(EnableTeamManagement));
+        exceptions[] = {"isNotInside"};
         statement = "";
         showDisabled = 1;
         priority = 3.2;
         icon = PATHTOF(UI\team\team_management_ca.paa);
-        enableInside = 1;
         hotkey = "M";
 
         class ACE_JoinTeamRed {
           displayName = "$STR_ACE_Interaction_JoinTeamRed";
           condition = QUOTE(true);
+          exceptions[] = {"isNotInside"};
           statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam));
           showDisabled = 1;
           priority = 2.4;
           icon = PATHTOF(UI\team\team_red_ca.paa);
-          enableInside = 1;
           hotkey = "R";
         };
         class ACE_JoinTeamGreen {
           displayName = "$STR_ACE_Interaction_JoinTeamGreen";
           condition = QUOTE(true);
+          exceptions[] = {"isNotInside"};
           statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam));
           showDisabled = 1;
           priority = 2.3;
           icon = PATHTOF(UI\team\team_green_ca.paa);
-          enableInside = 1;
           hotkey = "G";
         };
         class ACE_JoinTeamBlue {
           displayName = "$STR_ACE_Interaction_JoinTeamBlue";
           condition = QUOTE(true);
+          exceptions[] = {"isNotInside"};
           statement = QUOTE([ARR_2(_player,'BLUE')] call FUNC(joinTeam));
           showDisabled = 1;
           priority = 2.2;
           icon = PATHTOF(UI\team\team_blue_ca.paa);
-          enableInside = 1;
           hotkey = "B";
         };
         class ACE_JoinTeamYellow {
           displayName = "$STR_ACE_Interaction_JoinTeamYellow";
           condition = QUOTE(true);
+          exceptions[] = {"isNotInside"};
           statement = QUOTE([ARR_2(_player,'YELLOW')] call FUNC(joinTeam));
           showDisabled = 1;
           priority = 2.1;
           icon = PATHTOF(UI\team\team_yellow_ca.paa);
-          enableInside = 1;
           hotkey = "Y";
         };
 
         class ACE_LeaveTeam {
           displayName = "$STR_ACE_Interaction_LeaveTeam";
           condition = QUOTE(assignedTeam _player != 'MAIN');
+          exceptions[] = {"isNotInside"};
           statement = QUOTE([ARR_2(_player,'MAIN')] call FUNC(joinTeam));
           showDisabled = 1;
           priority = 2.5;
           icon = PATHTOF(UI\team\team_white_ca.paa);
-          enableInside = 1;
           hotkey = "N";
         };
 
         class ACE_BecomeLeader {
           displayName = "$STR_ACE_Interaction_BecomeLeader";
           condition = QUOTE(count (units group _player) > 1 && {leader group _player != _player});
+          exceptions[] = {"isNotInside"};
           statement = QUOTE(_newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player;);
           showDisabled = 1;
           priority = 1.0;
           icon = PATHTOF(UI\team\team_white_ca.paa);
-          enableInside = 1;
           hotkey = "L";
         };
         class ACE_LeaveGroup {
           displayName = "$STR_ACE_Interaction_LeaveGroup";
           condition = QUOTE(count (units group _player) > 1);
+          exceptions[] = {"isNotInside"};
           statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;);
           showDisabled = 1;
           priority = 1.2;
           icon = PATHTOF(UI\team\team_management_ca.paa);
-          enableInside = 1;
           hotkey = "M";
         };
       };
@@ -399,13 +391,12 @@ class CfgVehicles {
       class ACE_Equipment {
         displayName = "$STR_ACE_Interaction_Equipment";
         condition = QUOTE(true);
+        exceptions[] = {"isNotInside","notOnMap"};
         statement = "";
         showDisabled = 1;
         priority = 4.5;
         icon = "";  // @todo
-        enableInside = 1;
         hotkey = "E";
-        exceptions[] = {"notOnMap"};
       };
     };
   };

addons/magazinerepack/CfgVehicles.hpp

@@ -5,12 +5,12 @@ class CfgVehicles {
             class ACE_RepackMagazines {
                 displayName = "$STR_ACE_MagazineRepack_RepackMagazines";
                 condition = QUOTE(true);
+                exceptions[] = {"isNotInside"};
                 statement = QUOTE([_player] call FUNC(openSelectMagazineUI));
                 showDisabled = 0;
                 priority = -2;
                 icon = QUOTE(PATHTOF(UI\repack_ca.paa));
                 hotkey = "R";
-                enableInside = 1;
             };
         };
     };

addons/maptools/CfgVehicles.hpp

@@ -7,73 +7,65 @@ class CfgVehicles {
                 displayName = "$STR_ACE_MapTools_MapTools_Menu";
                 condition = QUOTE((call FUNC(canUseMapTools) || {call FUNC(canUseMapGPS)}));
                 statement = "";
-                exceptions[] = {"isNotDragging", "notOnMap"};
+                exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                 showDisabled = 0;
                 priority = 100;
-                enableInside = 1;
 
                 class ACE_MapToolsHide {
                     displayName = "$STR_ACE_MapTools_MapToolsHide";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 0; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 1;
                     priority = 5;
-                    enableInside = 1;
                 };
                 class ACE_MapToolsShowNormal {
                     displayName = "$STR_ACE_MapTools_MapToolsShowNormal";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 1}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 1; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 1;
                     priority = 4;
-                    enableInside = 1;
                 };
                 class ACE_MapToolsShowSmall {
                     displayName = "$STR_ACE_MapTools_MapToolsShowSmall";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 2}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 2; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 1;
                     priority = 3;
-                    enableInside = 1;
                 };
                 class ACE_MapToolsAlignNorth {
                     displayName = "$STR_ACE_MapTools_MapToolsAlignNorth";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
                     statement = QUOTE(GVAR(mapTool_angle) = 0; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 1;
                     priority = 2;
-                    enableInside = 1;
                 };
                 class ACE_MapToolsAlignCompass {
                     displayName = "$STR_ACE_MapTools_MapToolsAlignCompass";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0} && {('ItemCompass' in assigneditems ACE_player) || {'ItemCompass' in assigneditems ACE_player}}));
                     statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 1;
                     priority = 1;
-                    enableInside = 1;
                 };
                 class ACE_MapGpsShow {
                     displayName = "$STR_ACE_MapTools_MapGpsShow";
                     condition = QUOTE((call FUNC(canUseMapGPS) && {!GVAR(mapGpsShow)}));
                     statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 0;
                     priority = 0;
-                    enableInside = 1;
                 };
                 class ACE_MapGpsHide {
                     displayName = "$STR_ACE_MapTools_MapGpsHide";
                     condition = QUOTE((call FUNC(canUseMapGPS) && {GVAR(mapGpsShow)}));
                     statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps));
-                    exceptions[] = {"isNotDragging", "notOnMap"};
+                    exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"};
                     showDisabled = 0;
                     priority = 0;
-                    enableInside = 1;
                 };
             };
         };

addons/maptools/functions/fnc_handleMouseZChanged.sqf

@@ -21,6 +21,7 @@ diag_log "Scroll";
 diag_log _this;
 _handled   = false;
 
+_handled = true;
 // If drawing, change line color
 
 

addons/medical/CfgVehicles.hpp

@@ -352,12 +352,14 @@ class CfgVehicles {
                 displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical";
                 runOnHover = 1;
                 hotkey = "M";
+                exceptions[] = {"isNotInside"};
                 statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
                 icon = PATHTOF(UI\icons\medical_cross.paa);
 
                class ACE_Head {
                     displayName = "$STR_ACE_Interaction_Head";
                     icon = PATHTOF(UI\icons\medical_cross.paa);
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
                     runOnHover = 1;
 
@@ -365,11 +367,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_Medical_Bandage_HitHead";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     // Advanced medical
@@ -377,40 +379,45 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class CheckPulse: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment));
                         icon = "";
                     };
                     class CheckBloodPressure: CheckPulse {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
                         condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment));
                     };
                 };
@@ -419,22 +426,22 @@ class CfgVehicles {
                     distance = 5.0;
                     condition = "true";
                     runOnHover = 1;
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation));
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\medical_cross.paa);
 
                     class Bandage {
                         displayName = "$STR_ACE_Medical_Bandage_HitBody";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
 
@@ -442,11 +449,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard";
                         distance = 2.0;
                         condition = "true";
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\triageCard.paa);
                     };
 
@@ -455,28 +462,31 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
@@ -484,6 +494,7 @@ class CfgVehicles {
                 class ACE_ArmLeft {
                     displayName = "$STR_ACE_Interaction_ArmLeft";
                     runOnHover = 1;
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 2)] call DFUNC(displayPatientInformation));
                     icon = PATHTOF(UI\icons\medical_cross.paa);
 
@@ -491,11 +502,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_Medical_Bandage_HitLeftArm";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
 
@@ -504,75 +515,86 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class Tourniquet: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\tourniquet.paa);
                     };
                     class Morphine: fieldDressing {
                         displayName = "$STR_ACE_Medical_Inject_Morphine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Morphine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Morphine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class Atropine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Atropine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class Epinephrine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Epinephrine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Epinephrine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Epinephrine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class CheckPulse: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment));
                         icon = "";
                     };
                     class CheckBloodPressure: CheckPulse {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment));
                     };
                     class RemoveTourniquet: Tourniquet {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment));
                     };
                 };
                 class ACE_ArmRight {
                     displayName = "$STR_ACE_Interaction_ArmRight";
                     runOnHover = 1;
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 3)] call DFUNC(displayPatientInformation));
                     icon = PATHTOF(UI\icons\medical_cross.paa);
 
@@ -580,11 +602,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_Medical_Bandage_HitRightArm";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
 
@@ -593,71 +615,82 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment));
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment));
                     };
                     class Tourniquet: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\tourniquet.paa);
                     };
                     class Morphine: fieldDressing {
                         displayName = "$STR_ACE_Medical_Inject_Morphine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Morphine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Morphine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class Atropine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Atropine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(treatment));
                     };
                     class Epinephrine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Epinephrine";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(treatment));
                     };
                     class CheckPulse: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment));
                         icon = "";
                     };
                     class CheckBloodPressure: CheckPulse {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment));
                     };
                     class RemoveTourniquet: Tourniquet {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment));
                     };
                 };
                 class ACE_LegLeft {
                     displayName = "$STR_ACE_Interaction_LegLeft";
                     runOnHover = 1;
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 4)] call DFUNC(displayPatientInformation));
                     icon = PATHTOF(UI\icons\medical_cross.paa);
 
@@ -665,11 +698,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_Medical_Bandage_HitLeftLeg";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
 
@@ -679,60 +712,69 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment));
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment));
                     };
                     class Tourniquet: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\tourniquet.paa);
                     };
                     class Morphine: fieldDressing {
                         displayName = "$STR_ACE_Medical_Inject_Morphine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Morphine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Morphine')] call DFUNC(treatment));
                     };
                     class Atropine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Atropine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class Epinephrine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Epinephrine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(treatment));
                     };
                     class RemoveTourniquet: Tourniquet {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment));
                     };
                 };
                 class ACE_LegRight {
                     displayName = "$STR_ACE_Interaction_LegRight";
                     runOnHover = 1;
+                    exceptions[] = {"isNotInside"};
                     statement = QUOTE([ARR_3(_target, true, 5)] call DFUNC(displayPatientInformation));
                     icon = PATHTOF(UI\icons\medical_cross.paa);
 
@@ -740,11 +782,11 @@ class CfgVehicles {
                         displayName = "$STR_ACE_Medical_Bandage_HitRightLeg";
                         distance = 2.0;
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(treatment));
                         showDisabled = 1;
                         priority = 2;
                         hotkey = "B";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
 
@@ -754,54 +796,62 @@ class CfgVehicles {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
                         distance = 5.0;
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment));
                         showDisabled = 0;
                         priority = 2;
                         hotkey = "";
-                        enableInside = 1;
                         icon = PATHTOF(UI\icons\bandage.paa);
                     };
                     class PackingBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\packingBandage.paa);
                     };
                     class ElasticBandage: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment));
                     };
                     class QuikClot: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment));
                     };
                     class Tourniquet: fieldDressing {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\tourniquet.paa);
                     };
                     class Morphine: fieldDressing {
                         displayName = "$STR_ACE_Medical_Inject_Morphine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Morphine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Morphine')] call DFUNC(treatment));
                         icon = PATHTOF(UI\icons\autoInjector.paa);
                     };
                     class Atropine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Atropine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(treatment));
                     };
                     class Epinephrine: Morphine {
                         displayName = "$STR_ACE_Medical_Inject_Epinephrine";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(treatment));
                     };
                     class RemoveTourniquet: Tourniquet {
                         displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
                         condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
+                        exceptions[] = {"isNotInside"};
                         statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment));
                     };
                 };
@@ -822,7 +872,6 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "B";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 // Advanced medical
@@ -834,7 +883,6 @@ class CfgVehicles {
                     showDisabled = 0;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 class PackingBandage: fieldDressing {
@@ -986,7 +1034,6 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "B";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
 
@@ -999,7 +1046,6 @@ class CfgVehicles {
                     showDisabled = 0;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 class PackingBandage: fieldDressing {
@@ -1121,7 +1167,6 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "B";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
 
@@ -1134,7 +1179,6 @@ class CfgVehicles {
                     showDisabled = 0;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 class PackingBandage: fieldDressing {
@@ -1253,7 +1297,6 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "B";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
 
@@ -1267,7 +1310,6 @@ class CfgVehicles {
                     showDisabled = 0;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 class PackingBandage: fieldDressing {
@@ -1374,7 +1416,6 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 2;
                     hotkey = "B";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
 
@@ -1388,7 +1429,6 @@ class CfgVehicles {
                     showDisabled = 0;
                     priority = 2;
                     hotkey = "";
-                    enableInside = 1;
                     icon = PATHTOF(UI\icons\bandage.paa);
                 };
                 class PackingBandage: fieldDressing {

addons/overheating/CfgVehicles.hpp

@@ -17,6 +17,7 @@ class CfgVehicles {
             class ACE_CheckTemperature {
                 displayName = "$STR_ACE_Overheating_CheckTemperatureShort";
                 condition = QUOTE( currentWeapon _player in [ARR_3(primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player)] );
+                exceptions[] = {"isNotInside"};
                 statement = QUOTE( [ARR_2(_player, currentWeapon _player)] call FUNC(CheckTemperature); );
                 showDisabled = 0;
                 priority = 3.1;