mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
remove gps definitions
This commit is contained in:
parent
1270d17951
commit
744cd45ee5
@ -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) {
|
||||
@ -120,14 +112,6 @@ class GVAR(SeekerTypes) {
|
||||
functionName = QFUNC(seekerType_IR);
|
||||
onFired = QFUNC(IR_onFired);
|
||||
};
|
||||
class GPS {
|
||||
name = "";
|
||||
visualName = "";
|
||||
description = "";
|
||||
|
||||
functionName = QFUNC(seekerType_GPS);
|
||||
onFired = QFUNC(gps_seekerOnFired);
|
||||
};
|
||||
};
|
||||
|
||||
class GVAR(NavigationTypes) {
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -19,5 +19,3 @@ class CfgPatches {
|
||||
#include "CfgAmmo.hpp"
|
||||
#include "CfgMagazines.hpp"
|
||||
#include "CfgWeapons.hpp"
|
||||
|
||||
#include "GPSDialog.hpp"
|
||||
|
@ -1,28 +0,0 @@
|
||||
#include "..\script_component.hpp"
|
||||
/*
|
||||
* Author: tcvm
|
||||
* Returns GPS position. That's it.
|
||||
*
|
||||
* Arguments:
|
||||
* 1: Guidance Arg Array <ARRAY>
|
||||
* 2: Seeker State <ARRAY>
|
||||
*
|
||||
* Return Value:
|
||||
* Position of wanted missile pos relative to the camera direction <ARRAY>
|
||||
*
|
||||
* 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
|
||||
|
@ -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
|
||||
|
||||
|
@ -214,39 +214,6 @@
|
||||
<Key ID="STR_ACE_MissileGuidance_Hydra70_DAGR_24x">
|
||||
<English>24x DAGR [ACE]</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_header">
|
||||
<English>GPS Weapon Setup</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_too">
|
||||
<English>TARGET OF OPPORTUNITY</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_pp">
|
||||
<English>PRE-PLANNED</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_easting">
|
||||
<English>Easting</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_northing">
|
||||
<English>Northing</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_altitude">
|
||||
<English>Altitude</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_impact_angle">
|
||||
<English>Impact Angle</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_attack_heading">
|
||||
<English>Attack Heading</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_cancel">
|
||||
<English>Cancel</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_confirm">
|
||||
<English>Confirm</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_GPS_ui_pp_short">
|
||||
<English>PP</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MissileGuidance_mclosUp">
|
||||
<English>MCLOS Up</English>
|
||||
</Key>
|
||||
|
Loading…
Reference in New Issue
Block a user