mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
align correctly, create event, remove FCS from laserDesignator.
This commit is contained in:
parent
971566fc3e
commit
2ec74a6a3e
@ -35,13 +35,6 @@ class RscInGameUI {
|
||||
};
|
||||
};
|
||||
};
|
||||
class RscOptics_LaserDesignator {
|
||||
class CA_IGUI_elements_group: RscControlsGroup {
|
||||
class controls {
|
||||
MACRO_RANGEFINDER
|
||||
};
|
||||
};
|
||||
};
|
||||
class RscWeaponRangeFinderMAAWS {
|
||||
class CA_IGUI_elements_group: RscControlsGroup {
|
||||
class controls {
|
||||
|
@ -10,5 +10,6 @@ class CfgWeapons {
|
||||
|
||||
lockingTargetSound[] = {"",0,1};
|
||||
lockedTargetSound[] = {"",0,1};
|
||||
|
||||
};
|
||||
};
|
@ -4,6 +4,7 @@ class CfgVehicles {
|
||||
class LaserTarget: All {
|
||||
// @TODO: Changing the model and simulation hides it, but THEN IT DOESNT SPAWN WTF!?
|
||||
model = "\A3\Weapons_F\empty.p3d";
|
||||
destrType = "DestructNo";
|
||||
simulation = "house";
|
||||
|
||||
class EventHandlers {
|
||||
|
@ -2,12 +2,17 @@ class RscControlsGroup;
|
||||
class VScrollbar;
|
||||
class HScrollbar;
|
||||
class RscText;
|
||||
class RscMapControl;
|
||||
|
||||
class RscInGameUI {
|
||||
class RscOptics_LaserDesignator {
|
||||
idd = 300;
|
||||
controls[] = {"CA_IGUI_elements_group"};
|
||||
|
||||
onLoad = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',(_this select 0)];";
|
||||
onUnload = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',nil];";
|
||||
|
||||
|
||||
class CA_IGUI_elements_group: RscControlsGroup {
|
||||
idc = 170;
|
||||
|
||||
@ -43,7 +48,7 @@ class RscInGameUI {
|
||||
shadow = 0;
|
||||
font = "EtelkaMonospacePro";
|
||||
text = "2456";
|
||||
x = "24.5 * (0.01875 * SafezoneH)";
|
||||
x = "24.6 * (0.01875 * SafezoneH)";
|
||||
y = "3 * (0.025 * SafezoneH)";
|
||||
w = "4 * (0.01875 * SafezoneH)";
|
||||
h = "1.5 * (0.025 * SafezoneH)";
|
||||
@ -101,6 +106,12 @@ class RscInGameUI {
|
||||
h = "1.6 * (0.025 * SafezoneH)";
|
||||
};
|
||||
|
||||
class ACE_LaserCode_Helper : RscMapControl {
|
||||
idc = -1;
|
||||
onDraw = QUOTE(_this call FUNC(onLaserDesignatorDraw));
|
||||
w = 0;
|
||||
h = 0;
|
||||
};
|
||||
class ACE_LaserCode : RscText {
|
||||
idc = 123001;
|
||||
style = 0;
|
||||
|
@ -11,6 +11,8 @@ PREP(findStrongestRay);
|
||||
PREP(translateToModelSpace);
|
||||
PREP(translateToWeaponSpace);
|
||||
|
||||
PREP(onLaserDesignatorDraw);
|
||||
|
||||
PREP(seekerFindLaserSpot);
|
||||
PREP(laserOn);
|
||||
PREP(laserOff);
|
||||
|
5
addons/laser/functions/fnc_onLaserDesignatorDraw.sqf
Normal file
5
addons/laser/functions/fnc_onLaserDesignatorDraw.sqf
Normal file
@ -0,0 +1,5 @@
|
||||
#define DEBUG_MODE_FULL
|
||||
#include "script_component.hpp"
|
||||
|
||||
|
||||
TRACE_1("", _this);
|
@ -12,4 +12,8 @@
|
||||
#include "\z\ace\Addons\main\script_macros.hpp"
|
||||
|
||||
|
||||
#define FIREMODE_DIRECT_LOAL 1
|
||||
#define FIREMODE_DIRECT_LOAL 1
|
||||
|
||||
|
||||
#define __LaserDesignatorIGUI (uiNamespace getVariable ["ACE_RscOptics_LaserDesignator", nil])
|
||||
#define __LaserDesignatorIGUI_LaserCode (__LaserDesignatorIGUI displayCtrl 123001)
|
Loading…
Reference in New Issue
Block a user