diff --git a/addons/missileguidance/ACE_GuidanceConfig.hpp b/addons/missileguidance/ACE_GuidanceConfig.hpp index 8ffea076f6..dffbc75c73 100644 --- a/addons/missileguidance/ACE_GuidanceConfig.hpp +++ b/addons/missileguidance/ACE_GuidanceConfig.hpp @@ -55,14 +55,6 @@ class GVAR(AttackProfiles) { functionName = QFUNC(attackProfile_BEAM); onFired = QFUNC(wire_onFired); // since Beam guidance is pretty much the same as Wire guidance, we can reuse this }; - class JDAM { - name = ""; - visualName = ""; - description = ""; - - functionName = QFUNC(attackProfile_JDAM); - onFired = QFUNC(gps_attackOnFired); - }; }; class GVAR(SeekerTypes) { @@ -100,7 +92,7 @@ class GVAR(SeekerTypes) { name = ""; visualName = ""; description = ""; - + functionName = QFUNC(seekerType_MWR); onFired = QFUNC(mwr_onFired); }; @@ -108,7 +100,7 @@ class GVAR(SeekerTypes) { name = ""; visualName = ""; description = ""; - + functionName = QFUNC(seekerType_Doppler); onFired = QFUNC(doppler_onFired); }; @@ -116,18 +108,10 @@ class GVAR(SeekerTypes) { name = ""; visualName = ""; description = ""; - + functionName = QFUNC(seekerType_IR); onFired = QFUNC(IR_onFired); }; - class GPS { - name = ""; - visualName = ""; - description = ""; - - functionName = QFUNC(seekerType_GPS); - onFired = QFUNC(gps_seekerOnFired); - }; }; class GVAR(NavigationTypes) { @@ -143,11 +127,11 @@ class GVAR(NavigationTypes) { functionName = QFUNC(navigationType_lineOfSight); onFired = QFUNC(proNav_onFired); }; - class ProportionalNavigation { + class ProportionalNavigation { functionName = QFUNC(navigationType_proNav); onFired = QFUNC(proNav_onFired); }; - class AugmentedProportionalNavigation { + class AugmentedProportionalNavigation { functionName = QFUNC(navigationType_augmentedProNav); onFired = QFUNC(proNav_onFired); }; diff --git a/addons/missileguidance/XEH_PREP.hpp b/addons/missileguidance/XEH_PREP.hpp index eede7d19e9..d07ac506be 100644 --- a/addons/missileguidance/XEH_PREP.hpp +++ b/addons/missileguidance/XEH_PREP.hpp @@ -49,11 +49,9 @@ PREP(seekerType_MCLOS); PREP(seekerType_Doppler); PREP(seekerType_MWR); PREP(seekerType_IR); -PREP(seekerType_GPS); // Attack Profiles OnFired PREP(wire_onFired); -PREP(gps_attackOnFired); // Seeker OnFired PREP(SACLOS_onFired); @@ -61,7 +59,6 @@ PREP(MCLOS_onFired); PREP(doppler_onFired); PREP(mwr_onFired); PREP(IR_onFired); -PREP(gps_seekerOnFired); // Navigation OnFired PREP(proNav_onFired); @@ -70,14 +67,3 @@ PREP(line_onFired); // State transitions PREP(javelin_midCourseTransition); -// GPS ui -PREP(gps_onLoad); -PREP(gps_onUnload); -PREP(gps_pbModeCycle); -PREP(gps_confirm); -PREP(gps_modeSelect); -PREP(gps_saveAttackSettings); -PREP(gps_loadAttackSettings); -PREP(gps_getAttackData); -PREP(gps_setupVehicle); - diff --git a/addons/missileguidance/XEH_postInit.sqf b/addons/missileguidance/XEH_postInit.sqf index ff6662d2fa..4279f5f6e2 100644 --- a/addons/missileguidance/XEH_postInit.sqf +++ b/addons/missileguidance/XEH_postInit.sqf @@ -50,18 +50,3 @@ GVAR(dev_fnc_projectileCamera) = compile preprocessFileLineNumbers QPATHTOF(dev\projectileCamera.sqf); if (!hasInterface) exitWith {}; - -["ace_settingsInitialized", { - ["turret", LINKFUNC(gps_setupVehicle), false] call CBA_fnc_addPlayerEventHandler; - ["vehicle", LINKFUNC(gps_setupVehicle), true] call CBA_fnc_addPlayerEventHandler; // only one of these needs the retro flag - - // Add UAV Control Compatibility - ["ACE_controlledUAV", { - params ["_UAV", "_seatAI", "_turret", "_position"]; - TRACE_4("ACE_controlledUAV EH",_UAV,_seatAI,_turret,_position); - if (!isNull _seatAI) then { - [_seatAI] call FUNC(gps_setupVehicle); - }; - }] call CBA_fnc_addEventHandler; -}] call CBA_fnc_addEventHandler; - diff --git a/addons/missileguidance/XEH_preInit.sqf b/addons/missileguidance/XEH_preInit.sqf index a03b4bfbdd..9b1a85e37c 100644 --- a/addons/missileguidance/XEH_preInit.sqf +++ b/addons/missileguidance/XEH_preInit.sqf @@ -11,20 +11,6 @@ PREP_RECOMPILE_END; // As weapons take config changes, there is little point in being able to disable guidance if (isNil QGVAR(enabled)) then { GVAR(enabled) = 2; }; -GVAR(gps_currentSettings) = [ - [0, 0, 0], // attack position - -1, // impact angle - -1 // attack heading -]; - -GVAR(gps_pbMode) = 0; -GVAR(gps_settings) = createHashMap; -for "_i" from 0 to MAX_PB_MODES do { - GVAR(gps_settings) set [_i, GVAR(currentSettings)]; -}; - -GVAR(gps_mode) = "pb"; - GVAR(debug_enableMissileCamera) = false; GVAR(debug_drawGuidanceInfo) = false; diff --git a/addons/missileguidance/config.cpp b/addons/missileguidance/config.cpp index 61f879f770..e98d99ebcb 100644 --- a/addons/missileguidance/config.cpp +++ b/addons/missileguidance/config.cpp @@ -19,5 +19,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" - -#include "GPSDialog.hpp" diff --git a/addons/missileguidance/functions/fnc_seekerType_GPS.sqf b/addons/missileguidance/functions/fnc_seekerType_GPS.sqf deleted file mode 100644 index cdb1562d31..0000000000 --- a/addons/missileguidance/functions/fnc_seekerType_GPS.sqf +++ /dev/null @@ -1,28 +0,0 @@ -#include "..\script_component.hpp" -/* - * Author: tcvm - * Returns GPS position. That's it. - * - * 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_gps - * - * Public: No - */ -params ["", "_args", "_seekerStateParams"]; -_args params ["", "", "", "", "", "_targetData"]; -(_seekerStateParams select 0) params ["_attackPosition"]; - -_targetData set [0, (getPosASL _projectile) vectorFromTo _attackPosition]; -_targetData set [2, (getPosASL _projectile) distance _attackPosition]; -_targetData set [3, [0, 0, 0]]; -_targetData set [4, [0, 0, 0]]; - -_attackPosition - diff --git a/addons/missileguidance/script_component.hpp b/addons/missileguidance/script_component.hpp index 40e980bec4..110ad3bc9b 100644 --- a/addons/missileguidance/script_component.hpp +++ b/addons/missileguidance/script_component.hpp @@ -30,12 +30,5 @@ #define ACTIVE_RADAR_POLL_FREQUENCY (1 / 7) #define ACTIVE_RADAR_MINIMUM_SCAN_AREA 30 -#define TERCOM_STATE_SEEKING_BASKET 0 -#define TERCOM_STATE_FOLLOWING_TERRAIN 1 -#define TERCOM_STATE_TERMINAL 2 - -#include "idc_defines.hpp" -#define CONTROLS_DISABLED_IN_TOO [GPS_UI_PB_MISSION_BACKWARD, GPS_UI_PB_MISSION_FORWARD, GPS_UI_EASTING, GPS_UI_NORTHING, GPS_UI_HEIGHT] - #define MAX_PB_MODES 6 diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 17696044bb..1acfd5455a 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -214,39 +214,6 @@ 24x DAGR [ACE] - - GPS Weapon Setup - - - TARGET OF OPPORTUNITY - - - PRE-PLANNED - - - Easting - - - Northing - - - Altitude - - - Impact Angle - - - Attack Heading - - - Cancel - - - Confirm - - - PP - MCLOS Up