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

Medical - Improve keybind to open med menu for vehicle occupant under cursor (#8160)

Browse Source 
* add lineIntersectsSurfaces to med menu key

* fix _target = nil if no intersections

* only look through player and player vehicle

* Update addons/medical_gui/XEH_postInit.sqf

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
This commit is contained in:
Steve Zhao 2021-10-11 04:29:09 -04:00 committed by GitHub
parent 1c921674a9
commit 0b2b4d7397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/medical_gui/XEH_postInit.sqf
View File

@ -33,13 +33,26 @@ GVAR(selfInteractionActions) = [];
}] call CBA_fnc_addEventHandler;
["ACE3 Common", QGVAR(openMedicalMenuKey), localize LSTRING(OpenMedicalMenu), {
// Get target (cursorTarget and cursorObject), if not valid then target is ACE_player
// Get target (cursorTarget, cursorObject, and lineIntersectsSurfaces along camera to maxDistance), if not valid then target is ACE_player
TRACE_3("Open menu key",cursorTarget,cursorObject,ACE_player);
private _target = cursorTarget;
if !(_target isKindOf "CAManBase" && {[ACE_player, _target] call FUNC(canOpenMenu)}) then {
_target = cursorObject;
if !(_target isKindOf "CAManBase" && {[ACE_player, _target] call FUNC(canOpenMenu)}) then {
_target = ACE_player;
private _start = AGLToASL positionCameraToWorld [0, 0, 0];
private _end = AGLToASL positionCameraToWorld [0, 0, GVAR(maxDistance)];
private _intersections = lineIntersectsSurfaces [_start, _end, ACE_player, objNull, true, -1, "FIRE"];
{
_x params ["", "", "_intersectObject"];
// Only look "through" player and player's vehicle
if (!(_intersectObject isKindOf "CAManBase") && {_intersectObject != vehicle ACE_player}) exitWith {};
if (_intersectObject != ACE_player && {_intersectObject isKindOf "CAManBase" && {[ACE_player, _intersectObject] call FUNC(canOpenMenu)}}) exitWith {
_target =_intersectObject
};
} forEach _intersections;
if (!(_target isKindOf "CAManBase") || {!([ACE_player, _target] call FUNC(canOpenMenu))}) then {
_target = ACE_player;
};
};
};