Weapon fixes (#682)

AH-64D-Apache-Official-Project · Jan 5, 2025 · a418423 · a418423
1 parent 1023bbb
commit a418423
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/@AH-64D Apache Longbow/Addons/fza_ah64_cannon/functions/fn_fired.sqf b/@AH-64D Apache Longbow/Addons/fza_ah64_cannon/functions/fn_fired.sqf
@@ -22,12 +22,14 @@ private _CannonFired = (_heli getVariable "fza_ah64_burst_fired") + 1;
 
 if (_burstLimit != -1) then {
     if (_CannonFired >= _burstLimit) then {
-        _heli selectweapon "fza_cannon_limit";
         [_heli] spawn {
             params["_heli"];
-            waitUntil {inputAction "defaultAction" < 0.5};
+            waitUntil {
+                _heli selectWeaponTurret ["fza_cannon_limit", [0]];
+                inputAction "defaultAction" < 0.5
+            };
             if (currentweapon _heli != "fza_cannon_limit") exitwith {};
-            _heli selectWeapon "fza_m230";
+            _heli selectWeaponTurret ["fza_m230", [0]];
         };
     };
     _heli setVariable ["fza_ah64_burst_fired", _CannonFired];

diff --git a/@AH-64D Apache Longbow/Addons/fza_ah64_controls/config/cfgVehicles/animationSources.hpp b/@AH-64D Apache Longbow/Addons/fza_ah64_controls/config/cfgVehicles/animationSources.hpp
@@ -55,7 +55,7 @@ class AnimationSources
     {
         displayName = "Swap IAFS for 1200rnd magazine";
         author = "AH-64D Development Team";
-        onPhaseChanged = "_this remoteExec [""fza_fnc_weaponSwapM230Mag"",_this # 0];";
+        onPhaseChanged = "_this call fza_fnc_weaponSwapM230Mag";
         source = "user";
         initPhase = 0;
         animPeriod = 0.001;

diff --git a/@AH-64D Apache Longbow/Addons/fza_ah64_controls/functions/weapon/fn_weaponSwapM230Mag.sqf b/@AH-64D Apache Longbow/Addons/fza_ah64_controls/functions/weapon/fn_weaponSwapM230Mag.sqf
@@ -1,5 +1,7 @@
 params ["_heli", "_phase"];
 
+if (!local _heli) exitwith {};
+
 _heli removeMagazineTurret ["fza_m230_300", [0]];
 _heli removeMagazineTurret ["fza_m230_1200", [0]];
 

diff --git a/@AH-64D Apache Longbow/Addons/fza_ah64_customise/functions/fn_add.sqf b/@AH-64D Apache Longbow/Addons/fza_ah64_customise/functions/fn_add.sqf
@@ -52,7 +52,7 @@ if (_targetComp == "IAFS") exitwith {
             private _nearestObject = nearestObject [_player, "fza_ah64_IAFS"];
             deleteVehicle _nearestObject;
             _target animateSource ["magazine_set_1200", 0];
-            [_target, 0] remoteExec ["fza_fnc_weaponSwapM230Mag", _target];
+            [_target, 0] remoteExec ["fza_fnc_weaponSwapM230Mag", [gunner _target, driver _target]];
             //Spawn 1200rnd Mag
             private _object = "fza_ah64_1200Magazine" createVehicle [0,0,0];
             [_player, _object] call ace_dragging_fnc_carryObject;
@@ -80,7 +80,7 @@ if (_targetComp == "MAG") exitwith {
             private _nearestObject = nearestObject [_player, "fza_ah64_1200Magazine"];
             deleteVehicle _nearestObject;
             _target animateSource ["magazine_set_1200", 1];
-            [_target, 1] remoteExec ["fza_fnc_weaponSwapM230Mag", _target];
+            [_target, 1] remoteExec ["fza_fnc_weaponSwapM230Mag", [gunner _target, driver _target]];
             //spawn IAFS
             private _object = "fza_ah64_IAFS" createVehicle [0,0,0];
             [_player, _object] call ace_dragging_fnc_carryObject;

diff --git a/@AH-64D Apache Longbow/Addons/fza_ah64_hydra/functions/fn_fired.sqf b/@AH-64D Apache Longbow/Addons/fza_ah64_hydra/functions/fn_fired.sqf
@@ -22,12 +22,14 @@ private _rocketsalvo = _heli getVariable "fza_ah64_rocketsalvo";
 
 if (_rocketsalvo != 1) then {
     if (_salvofired >= _rocketsalvo) then {
-        _heli selectweapon "fza_hydra_limit";
         [_heli,_weapon] spawn {
             params["_heli","_weapon"];
-            waitUntil {inputAction "defaultAction" < 0.5};
+            waitUntil {
+                _heli selectWeaponTurret ["fza_hydra_limit", [0]];
+                inputAction "defaultAction" < 0.5
+            };
             if (currentweapon _heli != "fza_hydra_limit") exitwith {};
-            _heli selectWeapon _weapon;
+            _heli selectWeaponTurret [_weapon, [0]];;
         };
     };
     _heli setVariable ["fza_ah64_salvofired", _salvofired];