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

code cleanup, default laser parameters, getVariable self designation specifics.

Browse Source
This commit is contained in:
jaynus 2015-04-12 11:38:07 -07:00
parent 6be8cc8d84
commit 9273a32d23
5 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/laser/XEH_pre_init.sqf
View File

@ -25,6 +25,10 @@ PREP(laser_init);
PREP(laserTargetPFH); PREP(laserTargetPFH);
ACE_LASERS = []; ACE_LASERS = [];
// Laser default variables
ACE_DEFAULT_LASER_CODE = 1001; ACE_DEFAULT_LASER_CODE = 1001;
ACE_DEFAULT_LASER_WAVELENGTH = 1550;
ACE_DEFAULT_LASER_BEAMSPREAD = 1;
GVAR(laserEmitters) = HASH_CREATE; GVAR(laserEmitters) = HASH_CREATE;

32
addons/laser_selfdesignate/CfgUI.hpp
View File

@ -1,32 +0,0 @@
class RscPicture;
class RscText;
class RscControlsGroupNoScrollbars;
/* This disables air radar. We need to make this a seperate HUD addon
class RscInGameUI
{
class RscUnitInfo
{
class CA_Radar: RscControlsGroupNoScrollbars
{
class controls
{
class CA_RadarBackground: RscPicture {
colorText[] = {0,0,0,0};
text = "";
};
class CA_RadarIcon: RscPicture {
colorText[] = {0,0,0,0};
};
class CA_Heading: RscText {
colorText[] = {0,0,0,0};
};
};
};
};
};
class CfgInGameUI
{
};
*/

6
addons/laser_selfdesignate/CfgVehicles.hpp
View File

@ -8,12 +8,6 @@ class CfgVehicles {
class Turrets { class Turrets {
class MainTurret; class MainTurret;
}; };
// TODO: move these to a different HUD addon
// commanderCanSee = 2+32;
// gunnerCanSee = 2+32;
// driverCanSee = 2+32;
}; };
class Helicopter_Base_F: Helicopter {}; class Helicopter_Base_F: Helicopter {};

2
addons/laser_selfdesignate/config.cpp
View File

@ -10,8 +10,6 @@ class CfgPatches {
}; };
}; };
#include "CfgUI.hpp"
#include "CfgEventhandlers.hpp" #include "CfgEventhandlers.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"

10
addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf
View File

@ -61,13 +61,19 @@ FUNC(laserHudDesignatePFH) = {
_this set[0, _args]; _this set[0, _args];
}; };
private ["_laserTarget", "_handle", "_vehicle", "_laserUuid"]; private ["_laserTarget", "_handle", "_vehicle", "_laserUuid", "_waveLength", "_beamSpread", "_laserCode"];
if(!GVAR(active)) then { if(!GVAR(active)) then {
GVAR(active) = true; GVAR(active) = true;
TRACE_1("Activating laser", ""); TRACE_1("Activating laser", "");
_laserUuid = [(vehicle ACE_player), ACE_player, QFUNC(findLaserSource), 1550, 1001, 1] call EFUNC(laser,laserOn);
// Get the self-designation variables, or use defaults
_laserCode = (vehicle ACE_player) getVariable[QGVAR(currentCode), ACE_DEFAULT_LASER_CODE];
_waveLength = (vehicle ACE_player) getVariable[QGVAR(currentWaveLength), ACE_DEFAULT_LASER_WAVELENGTH];
_beamSpread = (vehicle ACE_player) getVariable[QGVAR(currentBeamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
_laserUuid = [(vehicle ACE_player), ACE_player, QFUNC(findLaserSource), _waveLength, _laserCode, _beamSpread] call EFUNC(laser,laserOn);
// @TODO: Create the local target for the players side // @TODO: Create the local target for the players side
// @TODO: Nou gets to field all tickets about missing lasers. // @TODO: Nou gets to field all tickets about missing lasers.