Merge branch 'master' into casingConfig

acemod · Apr 1, 2024 · 19d3df3 · 19d3df3
2 parents 7a1c17c + 0c589c2
commit 19d3df3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
@@ -168,7 +168,7 @@ private _action = [
     // action display name will be overwritten in modifier function
     QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",
     {_player action ["TakeWeapon", _target, weaponCargo _target select 0]},
-    {count weaponCargo _target == 1},
+    {(count weaponCargo _target == 1) && {[_player, objNull, []] call EFUNC(common,canInteractWith)}}, // Not checking if container is claimed
     nil, nil, nil, nil, nil,
     {
         params ["_target", "", "", "_actionData"];

diff --git a/addons/yardage450/functions/fnc_turnOn.sqf b/addons/yardage450/functions/fnc_turnOn.sqf
@@ -33,12 +33,15 @@ GVAR(active) = true;
 [{
     if (CBA_missionTime - GVAR(powerOnTime) > 30) exitWith {
         GVAR(active) = false;
-        74210 cutText ["", "PLAIN"];
+        QUOTE(ADDON) cutText ["", "PLAIN"];
         [_this select 1] call CBA_fnc_removePerFrameHandler;
     };
 
     if (currentWeapon ACE_player == "ACE_Yardage450" && cameraView == "GUNNER") then {
-        74210 cutRsc ["ACE_RscYardage450", "PLAIN", 1, false];
+        if (isNil {__dsp} || {isNull __dsp} || {ctrlIDD __dsp != -1}) then {
+            TRACE_1("making display",__dsp);
+            QUOTE(ADDON) cutRsc ["ACE_RscYardage450", "PLAIN", 1, false];
+        };
 
         __ctrlLaser ctrlShow GVAR(lasing);
         if (GVAR(targetAcquired)) then {
@@ -51,7 +54,7 @@ GVAR(active) = true;
         __ctrlMeters ctrlShow !GVAR(useYards);
         __ctrlYards ctrlShow GVAR(useYards);
     } else {
-        74210 cutText ["", "PLAIN"];
+        QUOTE(ADDON) cutText ["", "PLAIN"];
     };
 
 }, 0, []] call CBA_fnc_addPerFrameHandler;