Missile Guidance - remove needed config entry on mclos weapons (acemo…

…d#10751)
Apricot-ale · Feb 22, 2025 · 1f1ad2d · 1f1ad2d
1 parent 646ea4c
commit 1f1ad2d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/addons/missileguidance/XEH_preInit.sqf b/addons/missileguidance/XEH_preInit.sqf
@@ -26,6 +26,8 @@ for "_i" from 0 to MAX_PB_MODES do {
 GVAR(gps_mode) = "pb";
 GVAR(gps_weapons) = createHashMap;
 
+GVAR(mclos_weapons) = createHashMap;
+
 GVAR(debug_enableMissileCamera) = false;
 GVAR(debug_drawGuidanceInfo) = false;
 

diff --git a/addons/missileguidance/dev/mock_weapons.hpp b/addons/missileguidance/dev/mock_weapons.hpp
@@ -1,7 +1,6 @@
 class MissileLauncher;
 class GVAR(mock_w_Malyutka): MissileLauncher {
     displayName = "Test Malyutka";
-    GVAR(hasMCLOSControl) = 1;
     magazineReloadTime=1;
     magazines[] = { QGVAR(mock_m_Malyutka) };
 };
diff --git a/addons/missileguidance/functions/fnc_MCLOS_buttonPressed.sqf b/addons/missileguidance/functions/fnc_MCLOS_buttonPressed.sqf
@@ -23,11 +23,17 @@ if (_player == _shooter) exitWith {};
 private _turret = _shooter unitTurret _player;
 
 if (((_shooter weaponsTurret _turret) findIf {
-    (getNumber (configFile >> "CfgWeapons" >> _x >> QGVAR(hasMCLOSControl))) == 1
+    private _weapon = _x;
+    GVAR(mclos_weapons) getOrDefaultCall [_weapon, {
+        ((compatibleMagazines _weapon) findIf {
+            private _mag = _x;
+            private _ammo = getText (configFile >> "CfgMagazines" >> _mag >> "ammo");
+            ("MCLOS" in getArray (configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON) >> "seekerTypes"))
+    }) != -1}, true]
 }) == -1) exitWith { false };
 
 
-playSound "ACE_Sound_Click_20db";
+playSound "ACE_Sound_Click_10db";
 
 private _currentDirection = _shooter getVariable [QGVAR(MCLOS_direction), [0, 0, 0]];
 // Send data across network for handling non-local projectiles