diff --git a/addons/missileguidance/ACE_GuidanceConfig.hpp b/addons/missileguidance/ACE_GuidanceConfig.hpp index 438fcf1dc6..0475da204e 100644 --- a/addons/missileguidance/ACE_GuidanceConfig.hpp +++ b/addons/missileguidance/ACE_GuidanceConfig.hpp @@ -80,14 +80,6 @@ class GVAR(SeekerTypes) { functionName = QFUNC(seekerType_SACLOS); onFired = QFUNC(SACLOS_onFired); }; - class MCLOS { - name = ""; - visualName = ""; - description = ""; - - functionName = QFUNC(seekerType_MCLOS); - onFired = QFUNC(MCLOS_onFired); - }; class MillimeterWaveRadar { name = ""; visualName = ""; diff --git a/addons/missileguidance/XEH_PREP.hpp b/addons/missileguidance/XEH_PREP.hpp index 77be5fa77a..2d6b1874be 100644 --- a/addons/missileguidance/XEH_PREP.hpp +++ b/addons/missileguidance/XEH_PREP.hpp @@ -18,8 +18,6 @@ PREP(handleHandoff); PREP(shouldFilterRadarHit); -PREP(mclosButtonPressed); - // Attack Profiles PREP(attackProfile_AIR); PREP(attackProfile_DIR); @@ -45,7 +43,6 @@ PREP(navigationType_direct); PREP(seekerType_SALH); PREP(seekerType_Optic); PREP(seekerType_SACLOS); -PREP(seekerType_MCLOS); PREP(seekerType_Doppler); PREP(seekerType_MWR); @@ -54,7 +51,6 @@ PREP(wire_onFired); // Seeker OnFired PREP(SACLOS_onFired); -PREP(MCLOS_onFired); PREP(doppler_onFired); PREP(mwr_onFired); diff --git a/addons/missileguidance/XEH_postInit.sqf b/addons/missileguidance/XEH_postInit.sqf index 4279f5f6e2..bb4ac3f9c0 100644 --- a/addons/missileguidance/XEH_postInit.sqf +++ b/addons/missileguidance/XEH_postInit.sqf @@ -10,43 +10,6 @@ }, [15, [false, true, false]], false] call CBA_fnc_addKeybind; //Ctrl+Tab Key -// Each MCLOS argument is the vector which acceleration will be applied -["ACE3 Weapons", QGVAR(mclosUp), localize LSTRING(mclosUp), { - [[0, 0, 1], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, { - [[0, 0, -1], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, -[0x48, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // Numpad 8 - -["ACE3 Weapons", QGVAR(mclosDown), localize LSTRING(mclosDown), { - [[0, 0, -1], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, { - [[0, 0, 1], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, -[0x50, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // Numpad 2 - -["ACE3 Weapons", QGVAR(mclosLeft), localize LSTRING(mclosLeft), { - [[1, 0, 0], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, { - [[-1, 0, 0], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, -[0x4D, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // Numpad 6 - -["ACE3 Weapons", QGVAR(mclosRight), localize LSTRING(mclosRight), { - [[-1, 0, 0], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, { - [[1, 0, 0], ACE_PLAYER] call FUNC(mclosButtonPressed); - false -}, -[0x4B, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // Numpad 4 - GVAR(dev_fnc_projectileCamera) = compile preprocessFileLineNumbers QPATHTOF(dev\projectileCamera.sqf); if (!hasInterface) exitWith {}; diff --git a/addons/missileguidance/functions/fnc_MCLOS_onFired.sqf b/addons/missileguidance/functions/fnc_MCLOS_onFired.sqf deleted file mode 100644 index 3125615c3e..0000000000 --- a/addons/missileguidance/functions/fnc_MCLOS_onFired.sqf +++ /dev/null @@ -1,20 +0,0 @@ -#include "..\script_component.hpp" -/* - * Author: tcvm - * Sets up SACLOS state arrays (called from missileGuidance's onFired). - * - * Arguments: - * Guidance Arg Array - * - * Return Value: - * None - * - * Example: - * [] call ace_missileguidance_fnc_SACLOS_onFired - * - * Public: No - */ -params ["_firedEH", "", "", "", "_stateParams"]; -_firedEH params ["_shooter","_weapon","","","","","_projectile"]; -_stateParams params ["", "_seekerStateParams"]; - diff --git a/addons/missileguidance/functions/fnc_mclosButtonPressed.sqf b/addons/missileguidance/functions/fnc_mclosButtonPressed.sqf deleted file mode 100644 index 21df00b74d..0000000000 --- a/addons/missileguidance/functions/fnc_mclosButtonPressed.sqf +++ /dev/null @@ -1,29 +0,0 @@ -#include "..\script_component.hpp" -/* - * Author: tcvm - * Handles MCLOS guidance via keyboard keys - * - * Arguments: - * Acceleration vector - * - * Return Value: - * None - * - * Example: - * [0, 0, 1] call ace_missileguidance_fnc_mclosButtonPressed - * - * Public: No - */ -params ["_accelerationDirection", "_player"]; -private _projectiles = _player getVariable [QGVAR(MCLOS_Projectiles), []]; -_projectiles = _projectiles select { _x isNotEqualTo objNull }; -_player setVariable [QGVAR(MCLOS_Projectiles), _projectiles]; - -private _vehicleHasMCLOS = 1 == getNumber ((configOf vehicle _player) >> QGVAR(hasMCLOSControl)); -if (_vehicleHasMCLOS) then { - playSound "ACE_Sound_Click"; -}; - -private _currentDirection = _player getVariable [QGVAR(MCLOS_direction), [0, 0, 0]]; -_player setVariable [QGVAR(MCLOS_direction), _currentDirection vectorAdd _accelerationDirection]; - diff --git a/addons/missileguidance/functions/fnc_seekerType_MCLOS.sqf b/addons/missileguidance/functions/fnc_seekerType_MCLOS.sqf deleted file mode 100644 index 79f016da1b..0000000000 --- a/addons/missileguidance/functions/fnc_seekerType_MCLOS.sqf +++ /dev/null @@ -1,32 +0,0 @@ -#include "..\script_component.hpp" -/* - * Author: tcvm - * SACLOS seeker - * - * Arguments: - * 1: Guidance Arg Array - * 2: Seeker State - * - * Return Value: - * Position of wanted missile pos relative to the camera direction - * - * Example: - * [] call ace_missileguidance_fnc_seekerType_SACLOS - * - * Public: No - */ -params ["", "_args"]; -_args params ["_firedEH", "", "_flightParams"]; -_firedEH params ["","","","","","","_projectile","_gunner"]; -_flightParams params ["_pitchRate", "_yawRate"]; - -private _projectilePos = getPosASLVisual _projectile; - -private _accelerationDirection = _projectile vectorModelToWorldVisual (_gunner getVariable [QGVAR(MCLOS_direction), [0, 0, 0]]); -private _returnPos = _projectilePos vectorAdd (_accelerationDirection vectorMultiply (_pitchRate max _yawRate)); - -_targetData set [0, _projectilePos vectorFromTo _returnPos]; -_targetData set [2, _returnPos distance _projectilePos]; - -_returnPos - diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 1acfd5455a..8020415eaa 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -214,17 +214,5 @@ 24x DAGR [ACE] - - MCLOS Up - - - MCLOS Down - - - MCLOS Right - - - MCLOS Left -