Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore files messed up by merge

Browse Source
This commit is contained in:
Bailey Danyluk 2024-05-27 19:40:56 -06:00
parent 09b1027cfc
commit b29c97ec81
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/missileguidance/ACE_GuidanceConfig.hpp
View File

@ -88,17 +88,6 @@ 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) {

5
addons/missileguidance/XEH_PREP.hpp
View File

@ -25,6 +25,7 @@ PREP(attackProfile_LIN);
PREP(attackProfile_LOFT);
PREP(attackProfile_WIRE);
PREP(attackProfile_BEAM);
PREP(attackProfile_JDAM);
// Javelin profiles
PREP(attackProfile_JAV_DIR);
@ -50,10 +51,6 @@ PREP(wire_onFired);
// Seeker OnFired
PREP(SACLOS_onFired);
<<<<<<< HEAD
=======
PREP(doppler_onFired);
>>>>>>> 79f28b99e (Isolate doppler)
PREP(mwr_onFired);
// Navigation OnFired

4
addons/missileguidance/script_component.hpp
View File

@ -29,7 +29,3 @@
#define DEFAULT_LEAD_DISTANCE 5
#define ACTIVE_RADAR_POLL_FREQUENCY (1 / 7)
#define ACTIVE_RADAR_MINIMUM_SCAN_AREA 30
<<<<<<< HEAD
=======
>>>>>>> 79f28b99e (Isolate doppler)

2
addons/nlaw/functions/fnc_attackProfile.sqf
View File

@ -56,5 +56,5 @@ if ((count _test) > 0) then {
};
#endif
// TRACE_1("Adjusted target position", _returnTargetPos);
// TRACE_1("Adjusted target position",_returnTargetPos);
_returnTargetPos;