Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some more fixes for self interaction inside vehicles

Browse Source
This commit is contained in:
Nicolás Badano 2015-03-24 16:06:03 -03:00
parent 4fb50fa71e
commit 77dc50f10f
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

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

3
addons/interaction/CfgVehicles.hpp
View File

@ -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"};
};
};
};

1
addons/medical/CfgVehicles.hpp
View File

@ -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));