From 1534f8cd8d861bf71d1c4d0711351ffb5a6b821e Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 5 Jul 2019 15:22:07 -0500
Subject: [PATCH] Quickmount - Improve interactu menu getIn for static weapon
 (#7090)

For small static weapons getInNearest would sometimes not detect the vehicle as the `getCameraViewDirection` may be pointing at the interaction node and not the vehicle
---
 addons/quickmount/XEH_postInitClient.sqf         |  2 +-
 addons/quickmount/functions/fnc_getInNearest.sqf | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/quickmount/XEH_postInitClient.sqf b/addons/quickmount/XEH_postInitClient.sqf
index 718c08b843..23c225f583 100644
--- a/addons/quickmount/XEH_postInitClient.sqf
+++ b/addons/quickmount/XEH_postInitClient.sqf
@@ -4,7 +4,7 @@ if (!hasInterface) exitWith {};
 
 ["ACE3 Movement", QGVAR(mount), [localize LSTRING(KeybindName), localize LSTRING(KeybindDescription)], "", {
     if (!dialog) then {
-        call FUNC(getInNearest);
+        [] call FUNC(getInNearest);
     };
     false
 }] call CBA_fnc_addKeybind;
diff --git a/addons/quickmount/functions/fnc_getInNearest.sqf b/addons/quickmount/functions/fnc_getInNearest.sqf
index 8e8d77fe8d..b94ba8f0d9 100644
--- a/addons/quickmount/functions/fnc_getInNearest.sqf
+++ b/addons/quickmount/functions/fnc_getInNearest.sqf
@@ -4,7 +4,7 @@
  * Mount the player in the vehicle they are directly looking at based on their distance.
  *
  * Arguments:
- * None
+ * 0: Target <OBJECT>(Optional)
  *
  * Return Value:
  * None
@@ -22,17 +22,27 @@ if (!GVAR(enabled) ||
     {ACE_player getVariable ["ace_unconscious", false]}
 ) exitWith {};
 
+params [["_interactionTarget", objNull, [objNull]]];
+TRACE_1("getInNearest",_interactionTarget);
+
 private _start = AGLtoASL (ACE_player modelToWorldVisual (ACE_player selectionPosition "pilot"));
 private _end = (_start vectorAdd (getCameraViewDirection ACE_player vectorMultiply GVAR(distance)));
 private _objects = lineIntersectsSurfaces [_start, _end, ACE_player];
 private _target = (_objects param [0, []]) param [2, objNull];
 
+if ((isNull _target) && {alive _interactionTarget}) then {
+    _end = _start vectorAdd ((_start vectorFromTo (aimPos _interactionTarget)) vectorMultiply GVAR(distance));
+    _objects = lineIntersectsSurfaces [_start, _end, ACE_player];
+    TRACE_1("2nd ray attempt at interaction target aim pos",_objects);
+    _target = (_objects param [0, []]) param [2, objNull];
+};
+
 if (locked _target in [2,3]) exitWith {
     [localize LSTRING(VehicleLocked)] call EFUNC(common,displayTextStructured);
     true
 };
 
-TRACE_1("",_target);
+TRACE_2("",_target,typeOf _target);
 
 if (!isNull _target &&
         {alive _target} &&