mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Isolate doppler
This commit is contained in:
parent
607cc8c0ec
commit
09b1027cfc
@ -1 +0,0 @@
|
||||
#include "\z\ace\addons\dragon\script_component.hpp"
|
@ -1 +0,0 @@
|
||||
#include "\z\ace\addons\hellfire\script_component.hpp"
|
@ -88,6 +88,17 @@ class GVAR(SeekerTypes) {
|
||||
functionName = QFUNC(seekerType_MWR);
|
||||
onFired = QFUNC(mwr_onFired);
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
class DopplerRadar {
|
||||
name = "";
|
||||
visualName = "";
|
||||
description = "";
|
||||
|
||||
functionName = QFUNC(seekerType_Doppler);
|
||||
onFired = QFUNC(doppler_onFired);
|
||||
};
|
||||
>>>>>>> 79f28b99e (Isolate doppler)
|
||||
};
|
||||
|
||||
class GVAR(NavigationTypes) {
|
||||
|
@ -25,7 +25,6 @@ PREP(attackProfile_LIN);
|
||||
PREP(attackProfile_LOFT);
|
||||
PREP(attackProfile_WIRE);
|
||||
PREP(attackProfile_BEAM);
|
||||
PREP(attackProfile_JDAM);
|
||||
|
||||
// Javelin profiles
|
||||
PREP(attackProfile_JAV_DIR);
|
||||
@ -51,6 +50,10 @@ PREP(wire_onFired);
|
||||
|
||||
// Seeker OnFired
|
||||
PREP(SACLOS_onFired);
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
PREP(doppler_onFired);
|
||||
>>>>>>> 79f28b99e (Isolate doppler)
|
||||
PREP(mwr_onFired);
|
||||
|
||||
// Navigation OnFired
|
||||
|
@ -29,3 +29,7 @@
|
||||
#define DEFAULT_LEAD_DISTANCE 5
|
||||
#define ACTIVE_RADAR_POLL_FREQUENCY (1 / 7)
|
||||
#define ACTIVE_RADAR_MINIMUM_SCAN_AREA 30
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 79f28b99e (Isolate doppler)
|
||||
|
@ -56,5 +56,5 @@ if ((count _test) > 0) then {
|
||||
};
|
||||
#endif
|
||||
|
||||
// TRACE_1("Adjusted target position",_returnTargetPos);
|
||||
// TRACE_1("Adjusted target position", _returnTargetPos);
|
||||
_returnTargetPos;
|
||||
|
Loading…
x
Reference in New Issue
Block a user