From 201ad5bfe61f6788f0a9a9e14e93ebd0fe3c5eeb Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:27:26 +0200
Subject: [PATCH] Laser - Remove unnecessary EGVAR (#10139)

Remove unnecessary EGVAR
---
 addons/laser/functions/fnc_addLaserTarget.sqf | 6 +++---
 addons/laser/functions/fnc_laserTargetPFH.sqf | 2 +-
 addons/laser/functions/fnc_showVehicleHud.sqf | 2 +-
 addons/laser/functions/fnc_toggleLST.sqf      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/laser/functions/fnc_addLaserTarget.sqf b/addons/laser/functions/fnc_addLaserTarget.sqf
index 3fc02b2189c..f0414fd3ad2 100644
--- a/addons/laser/functions/fnc_addLaserTarget.sqf
+++ b/addons/laser/functions/fnc_addLaserTarget.sqf
@@ -20,9 +20,9 @@ params ["_targetObject", "_vehicle"];
 TRACE_2("params",_targetObject,_vehicle);
 
 // Get the designator variables, or use defaults
-private _waveLength = _vehicle getVariable [QEGVAR(laser,waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
-private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
-private _beamSpread = _vehicle getVariable [QEGVAR(laser,beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
+private _waveLength = _vehicle getVariable [QGVAR(waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
+private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
+private _beamSpread = _vehicle getVariable [QGVAR(beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
 TRACE_3("codes",_waveLength,_laserCode,_beamSpread);
 
 // Laser method is the method ACE_Laser will use to determine from where to where it should project the designator cone
diff --git a/addons/laser/functions/fnc_laserTargetPFH.sqf b/addons/laser/functions/fnc_laserTargetPFH.sqf
index 0b19b4d1c34..af2098a6f8d 100644
--- a/addons/laser/functions/fnc_laserTargetPFH.sqf
+++ b/addons/laser/functions/fnc_laserTargetPFH.sqf
@@ -29,7 +29,7 @@ GVAR(trackedLaserTargets) = GVAR(trackedLaserTargets) select {
         TRACE_1("Laser off:",_laserUuid);
         false
     } else {
-        private _newCode = _owner getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+        private _newCode = _owner getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
         if (_laserCode != _newCode) then {
             TRACE_2("code change",_newCode,_laserCode);
             [QGVAR(updateCode), [_laserUuid, _newCode]] call CBA_fnc_globalEvent;
diff --git a/addons/laser/functions/fnc_showVehicleHud.sqf b/addons/laser/functions/fnc_showVehicleHud.sqf
index 778df61a6ca..35120a294d6 100644
--- a/addons/laser/functions/fnc_showVehicleHud.sqf
+++ b/addons/laser/functions/fnc_showVehicleHud.sqf
@@ -91,7 +91,7 @@ GVAR(pfID) = [{
     // Do Laser Scan:
     private _ammo = getText (configFile >> "CfgMagazines" >> _vehicle currentMagazineTurret _turretPath >> "ammo");
     private _laserSource = _vehicle modelToWorldWorld (_vehicle selectionPosition _seekerSource);
-    private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+    private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
     private _seekerAngle = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerAngle");
     private _seekerMaxRange = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerMaxRange");
     private _laserResult = [_laserSource, vectorDir _vehicle, _seekerAngle, _seekerMaxRange, [ACE_DEFAULT_LASER_WAVELENGTH,ACE_DEFAULT_LASER_WAVELENGTH], _laserCode, _vehicle] call EFUNC(laser,seekerFindLaserSpot);
diff --git a/addons/laser/functions/fnc_toggleLST.sqf b/addons/laser/functions/fnc_toggleLST.sqf
index 59969d014eb..eae4ad68ef7 100644
--- a/addons/laser/functions/fnc_toggleLST.sqf
+++ b/addons/laser/functions/fnc_toggleLST.sqf
@@ -39,7 +39,7 @@ if (_enabled) exitWith {};
         [_pfhID] call CBA_fnc_removePerFrameHandler;
     };
 
-    private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+    private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
     private _angle = 25;
 
     private _pos = _vehicle modelToWorldVisualWorld [0,0,0];