From c1a81160a1f906aebc03629719774153e436d586 Mon Sep 17 00:00:00 2001
From: BroBeans <cpgbrobeans@gmail.com>
Date: Sun, 15 Dec 2024 14:22:50 +0800
Subject: [PATCH 1/2] remove trace h60 mentions

---
 .sconsign.dblite                              | Bin 31483 -> 31483 bytes
 .../functions/attemptCloseActionMenu.sqf      |   2 +-
 .../functions/pointing/pointNetSend.sqf       |   2 +-
 .../functions/preInit.sqf                     |  22 ++++++++++--------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.sconsign.dblite b/.sconsign.dblite
index 45d3dabb51ed96136db9957bbb1a71bce2619072..e3d942c4a55107952fce927dcf1f232b48c6d90c 100644
GIT binary patch
delta 677
zcma*jy>1gh5C?EMiG`v-fecO+A$&kUoTZulx?NGwqyVFnprZ=fot?!lg2;y`c!Nku
zlk*EuQ-E|SXejA;1D*g%q%@@A?)(7GZa3P${<FW!i{9l$@9U$jZ3iqhuwWw!($SkF
zrP6>bJ;o5#e0qBl4tDF8Tc^ETM5V|Fic(0_)@y~)U^1o|ftIm-{NP~s?R5C!d%b?=
z`N|l9JsY4%i70{gXl;@dTrv=q>k^N<MEQB6`ZOF=XLtYQPB(|x6~a1<0Gw1*34qWd
zI`VDL&;7Qi+^qa?FxI|lNfvw%E(j%}Qw|HEi<F#D1+{_Si@<rm^4A9SM)s|jGq7zg
zhiG&lwl*RGcw=HaN?p&b#dgQl{=GrHa({RuFRY3rZPW}%-Zx&#5Rh^%SrJTX%T$+|
zysCG^&e}Gh@z!zk`+`JZ9g=Ypy_GVdPQF`@8ssnL*TW}Ekx$l-W_x^i<oDjsJMNRU
z!`VlkH|9UyJndh>d^G9Iv&Otep0AFVgO3*AS-H7d{hhwfmy3@U;#qlKf0#Y%UjchG
O>9Di%xc>9*=Jo%0EYmOm

delta 657
zcma)(Jx^3Y6o%Q08$!UsY}~|xh^z)p?k4kn&QvxOg4x7k3p+Dk$F(t`0i?8`lY+}1
z;1^&r4J{<}_WlAaNob_dxso8=QcQQA^Pcya>#NT7Rp<MwrB&%<L`zB&kwMa+K}s7O
z8J++@9Znu^{P{A@@0PxGY6IFMOPWb<6Bja;XB8s`mNN|44*%F5f1LE+p5^(c>(vl#
zFo|(PURWKB4goO|3gNiW0HP(n?zF^cX0bWy_nL!eziShN;7Rh3yek<(3x*O%c<+rW
z_x{frT{Nf5y&)xIh#`r{e1uX6r6kXS<4QzJ`VO$yZQNWhFAPpPHI_Oaf(=4NZvv0n
za+6$%HX6##JJ^1+`Mj5_7yXB|i<T288DioXWQ-CySs%Pst~C7DX=b<Wv@y<WV(q~y
z8KEUIWfK^T9K1_Ofzn(8D(_vJQ|*rPvHAIOd79*AG<i}LzvmxbckkhM<;L%z_{}^W
o&JL%`UAg(h!RVrDE+_Bn>2`04y}b45P4^yRZ;Ac<>+_?<zr<I_wg3PC

diff --git a/addons/hatchet_vxf_interaction/functions/attemptCloseActionMenu.sqf b/addons/hatchet_vxf_interaction/functions/attemptCloseActionMenu.sqf
index 9c1778b..a26e1ac 100644
--- a/addons/hatchet_vxf_interaction/functions/attemptCloseActionMenu.sqf
+++ b/addons/hatchet_vxf_interaction/functions/attemptCloseActionMenu.sqf
@@ -1,5 +1,5 @@
 [] spawn {
-    if (missionNamespace getVariable ["vxf_uh60_interaction_autoclose_actionmenu", false]) then {
+    if (missionNamespace getVariable ["vxf_interaction_autoclose_actionmenu", false]) then {
       showCommandingMenu "RscMainMenu";
       showCommandingMenu "";
     };
diff --git a/addons/hatchet_vxf_interaction/functions/pointing/pointNetSend.sqf b/addons/hatchet_vxf_interaction/functions/pointing/pointNetSend.sqf
index 71f52ca..d7d709c 100644
--- a/addons/hatchet_vxf_interaction/functions/pointing/pointNetSend.sqf
+++ b/addons/hatchet_vxf_interaction/functions/pointing/pointNetSend.sqf
@@ -8,6 +8,6 @@
 
 params ["_vehicle", "_pointPos", "_iconIndex", "_label"];
 
-if(vxf_uh60_interaction_pointing) then {
+if(vxf_interaction_pointing) then {
   [_pointPos, _iconIndex, _label] remoteExecCall ["vxf_interaction_fnc_pointNetReceive", crew _vehicle];
 };
diff --git a/addons/hatchet_vxf_interaction/functions/preInit.sqf b/addons/hatchet_vxf_interaction/functions/preInit.sqf
index 9b4795f..9bc6f2e 100644
--- a/addons/hatchet_vxf_interaction/functions/preInit.sqf
+++ b/addons/hatchet_vxf_interaction/functions/preInit.sqf
@@ -48,7 +48,7 @@
 ] call CBA_Settings_fnc_init;
 
 [
-  "vxf_uh60_interaction_pointing",
+  "vxf_interaction_pointing",
   "checkbox",
   "Enable pointing system(uses remoteCall)",
   "Hatchet Vehicle Framework",
@@ -79,7 +79,7 @@
 ] call CBA_fnc_addKeybind;
 
 [
-  "vxf_uh60_interaction_autoclose_actionmenu",
+  "vxf_interaction_autoclose_actionmenu",
   "checkbox",
   "Automatically close action menu (experimental)",
   "Hatchet Vehicle Framework",
@@ -103,13 +103,15 @@
   ]
 ] call CBA_fnc_addSetting;
 
-vtx_uh60m_enabled_jvmf = true;
-vtx_uh60m_enabled_fms = true;
-vtx_uh60m_enabled_mfd = true;
-vtx_uh60m_enabled_fd = true;
-vtx_uh60m_enabled_cas = true;
-vtx_uh60m_enabled_aar = true;
-vtx_uh60m_enabled_flir = true;
-vtx_uh60m_enabled_engine = true;
+[
+  "vxf_interaction_showDebugMessages",
+  "checkbox",
+  "Enable debug messages",
+  "Hatchet Vehicle Framework",
+  [false],
+  nil,
+  {}
+] call CBA_Settings_fnc_init;
+
 vxf_alternative_scroll_up = false;
 vxf_alternative_scroll_down = false;
\ No newline at end of file

From d485af023124bf03a363e8fccfa6872fb039fc05 Mon Sep 17 00:00:00 2001
From: BroBeans <cpgbrobeans@gmail.com>
Date: Sun, 15 Dec 2024 14:22:59 +0800
Subject: [PATCH 2/2] wrap debug messages

---
 addons/hatchet_vxf_interaction/functions/keys/buttonUp.sqf | 2 +-
 addons/hatchet_vxf_interaction/functions/keys/drag.sqf     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hatchet_vxf_interaction/functions/keys/buttonUp.sqf b/addons/hatchet_vxf_interaction/functions/keys/buttonUp.sqf
index a44fc25..6102255 100644
--- a/addons/hatchet_vxf_interaction/functions/keys/buttonUp.sqf
+++ b/addons/hatchet_vxf_interaction/functions/keys/buttonUp.sqf
@@ -22,7 +22,7 @@ vxf_interaction_buttonHoldCode = nil;
 if (!isNil "_knobClick") then {
   private _clickTime = time - vxf_interaction_dragging_buttonDownTime;
   if (_clickTime < 0.25) then {
-    systemChat format["CLICK TIME %1", _clickTime];
+    if (vxf_interactionShowDebugMessages) then {systemChat format["CLICK TIME %1", _clickTime];};
     [_vehicle] call _knobClick;
   };
 };
diff --git a/addons/hatchet_vxf_interaction/functions/keys/drag.sqf b/addons/hatchet_vxf_interaction/functions/keys/drag.sqf
index d830ee0..8bc5947 100644
--- a/addons/hatchet_vxf_interaction/functions/keys/drag.sqf
+++ b/addons/hatchet_vxf_interaction/functions/keys/drag.sqf
@@ -23,7 +23,7 @@ if (count _screenPos == 2) then {
  //systemchat str (_verticalDistance / _dragRange) * _animRange;
  //systemChat str [abs _verticalDistance, abs vxf_interaction_dragging_lastDragDistance, abs (abs vxf_interaction_dragging_lastDragDistance - abs _verticalDistance)];
  if(abs (abs vxf_interaction_dragging_lastDragDistance - abs _verticalDistance) > 0.02) then {
-   systemChat str _verticalDistance;
+   if (vxf_interactionShowDebugMessages) then {systemChat str _verticalDistance;};
    private _animRange = (_animLimits # 0) - (_animLimits # 1);
    vxf_interaction_dragging_lastDragDistance = _verticalDistance;
    private _dragEndPoint = vxf_interaction_dragging_startAnimPhase + ((_verticalDistance / _dragRange) * _animRange);