Skip to content

Commit 43c1f97

Browse files
authored
Laser - Remove unnecessary EGVAR (#10139)
Remove unnecessary EGVAR
1 parent db339ab commit 43c1f97

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

addons/laser/functions/fnc_addLaserTarget.sqf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ params ["_targetObject", "_vehicle"];
2020
TRACE_2("params",_targetObject,_vehicle);
2121

2222
// Get the designator variables, or use defaults
23-
private _waveLength = _vehicle getVariable [QEGVAR(laser,waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
24-
private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
25-
private _beamSpread = _vehicle getVariable [QEGVAR(laser,beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
23+
private _waveLength = _vehicle getVariable [QGVAR(waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
24+
private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
25+
private _beamSpread = _vehicle getVariable [QGVAR(beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
2626
TRACE_3("codes",_waveLength,_laserCode,_beamSpread);
2727

2828
// Laser method is the method ACE_Laser will use to determine from where to where it should project the designator cone

addons/laser/functions/fnc_laserTargetPFH.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ GVAR(trackedLaserTargets) = GVAR(trackedLaserTargets) select {
2929
TRACE_1("Laser off:",_laserUuid);
3030
false
3131
} else {
32-
private _newCode = _owner getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
32+
private _newCode = _owner getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
3333
if (_laserCode != _newCode) then {
3434
TRACE_2("code change",_newCode,_laserCode);
3535
[QGVAR(updateCode), [_laserUuid, _newCode]] call CBA_fnc_globalEvent;

addons/laser/functions/fnc_showVehicleHud.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ GVAR(pfID) = [{
9191
// Do Laser Scan:
9292
private _ammo = getText (configFile >> "CfgMagazines" >> _vehicle currentMagazineTurret _turretPath >> "ammo");
9393
private _laserSource = _vehicle modelToWorldWorld (_vehicle selectionPosition _seekerSource);
94-
private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
94+
private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
9595
private _seekerAngle = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerAngle");
9696
private _seekerMaxRange = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerMaxRange");
9797
private _laserResult = [_laserSource, vectorDir _vehicle, _seekerAngle, _seekerMaxRange, [ACE_DEFAULT_LASER_WAVELENGTH,ACE_DEFAULT_LASER_WAVELENGTH], _laserCode, _vehicle] call EFUNC(laser,seekerFindLaserSpot);

addons/laser/functions/fnc_toggleLST.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if (_enabled) exitWith {};
3939
[_pfhID] call CBA_fnc_removePerFrameHandler;
4040
};
4141

42-
private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
42+
private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
4343
private _angle = 25;
4444

4545
private _pos = _vehicle modelToWorldVisualWorld [0,0,0];

0 commit comments

Comments
 (0)