General - Fix some undefined variables (#10335)

* General - Fix some undefined variables

* cleanup reminders

* Fix arg to addPublicVariableEventHandler

addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf

@@ -16,6 +16,7 @@
  */
 
 if (isNull findDisplay 312) exitWith {
+    //IGNORE_PRIVATE_WARNING ["_thisEventHandler"];
     removeMissionEventHandler ["Draw3D", _thisEventHandler];
 };
 

addons/arsenal/functions/fnc_message.sqf

@@ -25,6 +25,7 @@ if (!isNil "_handle") then {
 };
 
 _handle = [_display, _messageBoxCtrl, time + 5, _message, FADE_DELAY] spawn {
+    //IGNORE_PRIVATE_WARNING ["_thisScript"];
     disableSerialization;
 
     params ["_display", "_control", "_timer", "_message", "_delay"];

addons/arsenal/functions/fnc_onSelChangedLeft.sqf

@@ -33,6 +33,7 @@ private _fnc_clearCurrentWeaponMags = {
 
     // If nothing was selected, remove all magazines from the current weapon
     if (_item != "") then {
+        //IGNORE_PRIVATE_WARNING ["_compatibleMags"];
         _compatibleMagsCurrentWeapon = _compatibleMagsCurrentWeapon - _compatibleMags;
     };
 

addons/arsenal/functions/fnc_sortPanel.sqf

@@ -155,6 +155,7 @@ private _for = if (_right) then {
     for "_i" from 0 to (lbSize _panel) - 1
 };
 
+//IGNORE_PRIVATE_WARNING ["_i"];
 _for do {
     // Get item
     _item = if (_right) then {

addons/artillerytables/functions/fnc_calculateElevation.sqf

@@ -32,7 +32,7 @@ params ["_targetDistance", "_targetHeight", "_muzzleVelocity", ["_highArc", true
 //MK6_82mm_AIR_FRICTION == -0.0001
 
 if (_airFriction != 0) then {
-    _muzzleVelocity = [_muzzleVelocity, _temperature, _atmosphericDensity] call FUNC(calculateMuzzleVelocity);
+    _muzzleVelocity = [_muzzleVelocity, _temperature, _airDensity] call FUNC(calculateMuzzleVelocity);
 };
 private _maxResults = [_muzzleVelocity, _airFriction] call FUNC(calculateMaxAngle);
 

addons/common/XEH_postInit.sqf

@@ -197,7 +197,7 @@ if (isServer) then {
 
 [QGVAR(unlockVehicle), {
     _this lock (_this getVariable [QGVAR(lockStatus), locked _this]);
-    if ([] isNotEqualTo getArray (configOf _target >> "assembleInfo" >> "dissasembleTo")) then {
+    if ([] isNotEqualTo getArray (configOf _this >> "assembleInfo" >> "dissasembleTo")) then {
         [_this, "disableWeaponAssembly", QGVAR(lockVehicle), false] call FUNC(statusEffect_set);
     };
 }] call CBA_fnc_addEventHandler;

addons/common/functions/fnc_cbaSettings.sqf

@@ -88,7 +88,7 @@ for "_index" from 0 to (_countOptions - 1) do {
         if (isNil (configName _optionEntry)) then {
             [_optionEntry] call FUNC(cbaSettings_loadFromConfig);
         } else {
-            WARNING_1("Setting [%1] - Already defined from somewhere else??",_varName);
+            WARNING_1("Setting [%1] - Already defined from somewhere else??",configName _optionEntry);
         };
         #ifdef DEBUG_MODE_FULL
     } else {
@@ -104,7 +104,7 @@ for "_index" from 0 to (_countOptions - 1) do {
     private _optionEntry = _missionSettingsConfig select _index;
     private _settingName = configName _optionEntry;
     if ((toLowerANSI _settingName) in GVAR(cbaSettings_forcedSettings)) then {
-        WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",_varName);
+        WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",configName _optionEntry);
     } else {
         if ((isNil _settingName) && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then {
             // New setting, that was first defined in missionConfigFile

addons/common/functions/fnc_checkFiles.sqf

@@ -144,7 +144,7 @@ if (isMultiplayer) then {
         publicVariable QGVAR(serverAddons);
         publicVariable QGVAR(serverSource);
     } else {
-        GVAR(clientVersion) = _version;
+        GVAR(clientVersion) = _mainVersion;
         GVAR(clientAddons) = _addons;
 
         private _fnc_check = {

addons/common/functions/fnc_checkPBOs.sqf

@@ -38,6 +38,7 @@ if (!_checkAll) exitWith {};
 if (!isServer) then {
     ["ace_versioning_clientCheckDone", {
         // Don't let this event get triggered again
+        //IGNORE_PRIVATE_WARNING ["_thisType", "_thisId", "_thisArgs"];
         [_thisType, _thisId] call CBA_fnc_removeEventHandler;
 
         params ["_clientErrors"];

addons/common/functions/fnc_checkVersionNumber.sqf

@@ -155,7 +155,7 @@ private _fnc_check = {
 
 // Wait for server to send the servers files and version numbers
 if (isNil "ACE_Version_ServerVersions") then {
-    ACE_Version_ServerVersions addPublicVariableEventHandler _fnc_check;
+    "ACE_Version_ServerVersions" addPublicVariableEventHandler _fnc_check;
 } else {
     call _fnc_check;
 };

addons/common/functions/fnc_getInPosition.sqf

@@ -40,6 +40,7 @@ private _enemiesInVehicle = false;   //Possible Side Restriction
     if (side _unit getFriend side _x < 0.6) exitWith {_enemiesInVehicle = true};
 } forEach crew _vehicle;
 
+//IGNORE_PRIVATE_WARNING ["_unit", "_isInside", "_vehicle", "_turret", "_index", "_fnc_getInEH", "_position"];
 switch (_position) do {
     case "driver" : {
         if (CANGETINDRIVER) then {

addons/common/functions/fnc_moduleLSDVehicles.sqf

@@ -24,7 +24,7 @@ if (isNil QGVAR(LSD_Vehicles)) then {
 };
 
 {
-    _hSCount = count (getArray (configOf _x >> "hiddenSelections"));
+    private _hSCount = count (getArray (configOf _x >> "hiddenSelections"));
     if (_hSCount > 0) then {
         GVAR(LSD_Vehicles) pushBack [_x, _hSCount];
     };

addons/common/functions/fnc_setSetting.sqf

@@ -29,8 +29,8 @@ if (!_broadcastChanges) exitWith {
     ERROR_1("Setting [%1] - SetSetting no longer supports non-global settings",_name);
 };
 
-if ([_settingName, "mission"] call CBA_settings_fnc_isForced) then {
-    WARNING_1("Setting [%1] - Already mission forced - Ignoring",_settingName);
+if ([_name, "mission"] call CBA_settings_fnc_isForced) then {
+    WARNING_1("Setting [%1] - Already mission forced - Ignoring",_name);
 };
 
 [QGVAR(setSetting), [_name, _value], (format [QGVAR(setSetting_%1), _name])] call CBA_fnc_globalEventJIP;

addons/compat_spe/compat_spe_csw/functions/fnc_alter_height.sqf

@@ -29,6 +29,7 @@ if (_playProgressBar) exitWith {
 
         [_weaponPlatform, _newStaticWeapon] call SPE_Weapons_Static_fnc_alter_height;
     }, {}, LSUBLSTRING(alteringHeight), {
+        //IGNORE_PRIVATE_WARNING ["_player"];
         (_this select 0) params ["_weaponPlatform"];
 
         _player distance _weaponPlatform <= 4 && {[_weaponPlatform, true] call SPE_Weapons_Static_fnc_can_alter_height}

addons/cookoff/functions/fnc_cookOffServer.sqf

@@ -199,4 +199,4 @@ if (_delayBetweenSmokeAndFire) then {
 }, [_vehicle, _selections, _ammoDetonationChance, _detonateAfterCookoff, _source, _instigator, _fireSelection, _canRing, _canJet, _smokeJipID, _fireJipID], _delay] call CBA_fnc_waitAndExecute;
 
 // API
-[QGVAR(cookoff), [_vehicle, _intensity, _instigator, _smokeDelayEnabled, _ammoDetonationChance, _detonateAfterCookoff, _fireSelection, _canRing, _maxIntensity, _canJet]] call CBA_fnc_globalEvent;
+[QGVAR(cookoff), [_vehicle, _intensity, _instigator, _delayBetweenSmokeAndFire, _ammoDetonationChance, _detonateAfterCookoff, _fireSelection, _canRing, _maxIntensity, _canJet]] call CBA_fnc_globalEvent;

addons/csw/functions/fnc_getUnloadActions.sqf

@@ -32,6 +32,7 @@ private _statement = {
         TIME_PROGRESSBAR(_timeToUnload),
         [_target, _turretPath, _player, _carryMag, _vehMag],
         {
+            //IGNORE_PRIVATE_WARNING ["_player"];
             (_this select 0) params ["_target", "_turretPath", "", "_carryMag", "_vehMag"];
             TRACE_5("unload progressBar finish",_target,_turretPath,_carryMag,_vehMag,_player);
             [QGVAR(removeTurretMag), [_target, _turretPath, _carryMag, _vehMag, _player]] call CBA_fnc_globalEvent;

addons/csw/functions/fnc_reload_loadMagazine.sqf

@@ -48,7 +48,7 @@ private _onFinish = {
         };
     } forEach (if (_magSource isKindOf "CAManBase") then {magazinesAmmo _magSource} else {magazinesAmmoCargo _magSource});
 
-    if (_bestAmmoToSend == -1) exitWith {ERROR_2("No ammo [%1 - %2]?",_xMag,_bestAmmoToSend);};
+    if (_bestAmmoToSend == -1) exitWith {ERROR_2("No ammo [%1 - %2]?",_carryMag,_bestAmmoToSend);};
     [_magSource, _carryMag, _bestAmmoToSend] call EFUNC(common,removeSpecificMagazine);
     if (_bestAmmoToSend == 0) exitWith {};
 

addons/dagr/functions/fnc_outputWP.sqf

@@ -47,14 +47,14 @@ GVAR(outputPFH) = [{
     private _xGrid2 = floor (DAGR_WP_INFO / 10000);
     private _yGrid2 = DAGR_WP_INFO - _xGrid2 * 10000;
 
-    _xCoord2 = switch true do {
+    private _xCoord2 = switch true do {
         case (_xGrid2 >= 1000): { "" + str(_xGrid2) };
         case (_xGrid2 >= 100): { "0" + str(_xGrid2) };
         case (_xGrid2 >= 10): { "00" + str(_xGrid2) };
         default             { "000" + str(_xGrid2) };
     };
 
-    _yCoord2 = switch true do {
+    private _yCoord2 = switch true do {
         case (_yGrid2 >= 1000): { "" + str(_yGrid2) };
         case (_yGrid2 >= 100): { "0" + str(_yGrid2) };
         case (_yGrid2 >= 10): { "00" + str(_yGrid2) };

addons/disarming/functions/fnc_openDisarmDialog.sqf

@@ -23,7 +23,7 @@ params ["_caller", "_target"];
 
 //Sanity Checks
 if (_caller != ACE_player) exitWith {ERROR("Player isn't caller?");};
-if !([_player, _target] call FUNC(canPlayerDisarmUnit)) exitWith {ERROR("Can't Disarm Unit");};
+if !([_caller, _target] call FUNC(canPlayerDisarmUnit)) exitWith {ERROR("Can't Disarm Unit");};
 if (dialog) then {ERROR("Dialog open when trying to open disarm dialog"); closeDialog 0;};
 
 disableSerialization;

addons/dogtags/XEH_postInit.sqf

@@ -89,6 +89,7 @@ if (hasInterface) then {
     if !(GETEGVAR(medical,enabled,false)) exitWith {};
 
     if (hasInterface) then {
+        //IGNORE_PRIVATE_WARNING ["_target", "_player"];
         private _checkTagAction = [
             "ACE_CheckDogtag",
             format ["%1: %2", LLSTRING(itemName), LLSTRING(checkDogtag)],

addons/dogtags/functions/fnc_addDogtagActions.sqf

@@ -18,6 +18,7 @@
 params ["_player"];
 
 private _fnc_getActions = {
+    //IGNORE_PRIVATE_WARNING ["_player"];
     private _actions = [];
     private _cfgWeapons = configFile >> "CfgWeapons";
 

addons/dragging/functions/fnc_handleAnimChanged.sqf

@@ -17,6 +17,7 @@
 */
 
 params ["_unit", "_anim"];
+//IGNORE_PRIVATE_WARNING ["_thisArgs", "_thisID"];
 _thisArgs params ["_realUnit"];
 TRACE_4("params",_unit,_anim,_realUnit,_thisID);
 

addons/dragging/functions/fnc_setCarryable.sqf

@@ -87,6 +87,7 @@ GVAR(initializedClasses_carry) = _initializedClasses;
 
 private _icon = [QPATHTOF(UI\icons\box_carry.paa), QPATHTOF(UI\icons\person_carry.paa)] select (_object isKindOf "CAManBase");
 
+//IGNORE_PRIVATE_WARNING ["_target", "_player"];
 private _carryAction = [
     QGVAR(carry),
     LLSTRING(Carry),

addons/dragging/functions/fnc_setDraggable.sqf

@@ -87,6 +87,7 @@ GVAR(initializedClasses) = _initializedClasses;
 
 private _icon = [QPATHTOF(UI\icons\box_drag.paa), QPATHTOF(UI\icons\person_drag.paa)] select (_object isKindOf "CAManBase");
 
+//IGNORE_PRIVATE_WARNING ["_target", "_player"];
 private _dragAction = [
     QGVAR(drag),
     LLSTRING(Drag),

addons/explosives/functions/fnc_addDetonateActions.sqf

@@ -157,6 +157,7 @@ if (_detonator != "ACE_DeadManSwitch") then {
                     format [localize LSTRING(connectInventoryExplosiveToDeadman), _name],
                     _picture,
                     {
+                        //IGNORE_PRIVATE_WARNING ["_player"];
                         params ["_player", "", "_mag"];
                         TRACE_2("set new",_player,_mag);
                         _player setVariable [QGVAR(deadmanInvExplosive), _mag, true];

addons/explosives/functions/fnc_getPlacedExplosives.sqf

@@ -16,7 +16,7 @@
  *
  * Public: Yes
  */
-// IGNORE_PRIVATE_WARNING(_allExplosives,_deadmanExplosives);
+//IGNORE_PRIVATE_WARNING ["_allExplosives", "_deadmanExplosives"];
 
 params ["_unit"];
 TRACE_1("params",_unit);

addons/explosives/functions/fnc_hasPlacedExplosives.sqf

@@ -14,6 +14,6 @@
  *
  * Public: Yes
  */
-// IGNORE_PRIVATE_WARNING(_hasPlacedExplosives);
+//IGNORE_PRIVATE_WARNING ["getPlacedExplosives"];
 
 (count (_this call FUNC(getPlacedExplosives)) > 0)

addons/field_rations/XEH_postInit.sqf

@@ -38,6 +38,7 @@ if !(hasInterface) exitWith {};
         [false, false, false, false, true]
     ] call EFUNC(interact_menu,createAction);
 
+    //IGNORE_PRIVATE_WARNING ["_player", "_target"];
     private _subActions = [
         [
             QGVAR(checkWater),

addons/field_rations/functions/fnc_getConsumableChildren.sqf

@@ -18,6 +18,7 @@
 params ["_player"];
 
 private _fnc_getActions = {
+    //IGNORE_PRIVATE_WARNING ["_player"];
     TRACE_1("Creating consumable item actions",_player);
 
     private _actions = [];

addons/fortify/XEH_postInit.sqf

@@ -50,6 +50,7 @@ GVAR(objectRotationZ) = 0;
         private _text = [format ["Remove Object +$%1", _cost], "Remove Object"] select (_budget == -1);
 
         // Remove object action
+        //IGNORE_PRIVATE_WARNING ["_player"];
         private _removeAction = [
             QGVAR(removeObject),
             _text,

addons/goggles/functions/fnc_applyDustEffect.sqf

@@ -57,7 +57,7 @@ GVAR(DustHandler) = [{
 
         private _amount = 1 - (GETDUSTT(DAMOUNT) * 0.125);
 
-        if !(_unit getVariable ["ACE_EyesDamaged", false]) then {
+        if !(ACE_player getVariable ["ACE_EyesDamaged", false]) then {
             GVAR(PostProcessEyes) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [_amount, _amount, _amount, _amount], [1, 1, 1, 0]];
             GVAR(PostProcessEyes) ppEffectCommit 0.5;
         };
@@ -68,7 +68,7 @@ GVAR(DustHandler) = [{
 
             GVAR(PostProcessEyes) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [1, 1, 1, 1], [1, 1, 1, 0]];
             GVAR(PostProcessEyes) ppEffectCommit 2;
-            [QGVAR(effect), [_unit, "dust"]] call CBA_fnc_localEvent;
+            [QGVAR(effect), [ACE_player, "dust"]] call CBA_fnc_localEvent;
 
             [{
                 if (GVAR(DustHandler) == -1) then {

addons/grenades/functions/fnc_flashbangExplosionEH.sqf

@@ -113,7 +113,7 @@ if (["ace_hearing"] call EFUNC(common,isModLoaded) && {_strength > 0} && {EGVAR(
 };
 
 // Add ace_medical pain effect
-if (GETEGVAR(medical,enabled,false) && {_strength > 0.1} && {isDamageAllowed _unit} && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) then {
+if (GETEGVAR(medical,enabled,false) && {_strength > 0.1} && {isDamageAllowed ACE_player} && {ACE_player getVariable [QEGVAR(medical,allowDamage), true]}) then {
     [ACE_player, _strength / 2] call EFUNC(medical,adjustPainLevel);
 };
 

addons/grenades/functions/fnc_incendiary.sqf

@@ -202,7 +202,7 @@ if (isServer) then {
             {EGVAR(cookoff,ammoCookoffDuration) != 0} &&
             {_x getVariable [QEGVAR(cookoff,enableAmmoCookoff), true]}
         ) then {
-            [QEGVAR(cookOff,cookOffBoxServer), _box] call CBA_fnc_serverEvent;
+            [QEGVAR(cookOff,cookOffBoxServer), _x] call CBA_fnc_serverEvent;
         } else {
             _x setDamage 1;
         };

addons/hitreactions/functions/fnc_getRandomAnimation.sqf

@@ -25,6 +25,7 @@ if (_weapon == "") exitWith {
 
 if (_weapon == primaryWeapon _unit) exitWith {
     if (_unit call EFUNC(common,isPlayer)) then {
+        //IGNORE_PRIVATE_WARNING ["_velocity"]; // from upper scope
         private _isRunning = _velocity > 4;
 
         [

addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf

@@ -109,6 +109,7 @@ if (_objectType isKindOf "CAManBase") then {
 
 TRACE_1("Building ACE_SelfActions",_objectType);
 // Create a master action to base on self action
+//IGNORE_PRIVATE_WARNING ["_target"];
 private _actions = [
         [
             [

addons/interact_menu/functions/fnc_createAction.sqf

@@ -26,7 +26,8 @@
  * Public: Yes
  */
 
-// IGNORE_PRIVATE_WARNING(_actionName,_displayName,_icon,_statement,_condition,_insertChildren,_customParams,_position,_distance,_params,_modifierFunction);
+//IGNORE_PRIVATE_WARNING ["_actionName", "_displayName", "_icon", "_statement", "_condition", "_insertChildren"];
+//IGNORE_PRIVATE_WARNING ["_customParams", "_position", "_distance", "_params", "_modifierFunction"];
 
 if (!hasInterface) exitWith { [] };
 params [

addons/interaction/XEH_postInit.sqf

@@ -172,6 +172,7 @@ GVAR(isOpeningDoor) = false;
 } forEach ["loadout", "weapon"];
 
 // add "Take _weapon_" action to dropped weapons
+//IGNORE_PRIVATE_WARNING ["_target", "_player"];
 private _action = [
     // action display name will be overwritten in modifier function
     QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",

addons/interaction/functions/fnc_addPassengersActions.sqf

@@ -41,6 +41,7 @@ private _icon = "";
         _icon = QPATHTOEF(captives,UI\handcuff_ca.paa);
     };
 
+    //IGNORE_PRIVATE_WARNING ["_target"];
     _actions pushBack [
         [
             str _unit,

addons/interaction/functions/fnc_addSquadChildren.sqf

@@ -29,6 +29,7 @@ private _fnc_color = {
 
 private _units = (units group _player) - [_player];
 
+//IGNORE_PRIVATE_WARNING ["_target"];
 private _subActions = [];
 _subActions pushBack (["drop", localize "str_a3_endgame_notifications_title_drop", "\a3\ui_f\data\igui\cfg\actions\ico_off_ca.paa", 
     {[_target] joinSilent grpNull}, {true}] call EFUNC(interact_menu,createAction));

addons/interaction/functions/fnc_doRemoteControl.sqf

@@ -13,6 +13,7 @@
  *
  * Public: No
  */
+//IGNORE_PRIVATE_WARNING ["_target"];
 
 private _units = curatorSelected select 0;
 private _index = _units findIf {

addons/interaction/functions/fnc_getVehiclePos.sqf

@@ -14,7 +14,7 @@
  *
  * Public: No
  */
-// IGNORE_PRIVATE_WARNING(_target);
+//IGNORE_PRIVATE_WARNING ["_target"];
 
 private _bb = boundingBoxReal _target;
 (_bb select 0) params ["_bbX", "_bbY", "_bbZ"];

addons/interaction/functions/fnc_getWeaponPos.sqf

@@ -14,7 +14,7 @@
  *
  * Public: No
  */
-// IGNORE_PRIVATE_WARNING(_target);
+//IGNORE_PRIVATE_WARNING ["_target"];
 
 private _weaponDir = _target weaponDirection currentWeapon _target;
 private _refSystem = _weaponDir call EFUNC(common,createOrthonormalReference);

addons/inventory/functions/fnc_forceItemListUpdate.sqf

@@ -31,7 +31,7 @@ private _config = configNull;
 
 for "_i" from (lbSize _itemList) - 1 to 0 step -1 do {
     // All items have their classnames in lbData, except backpacks
-    _className = _itemList lbData _i;
+    private _className = _itemList lbData _i;
 
     _config = if (_className != "") then {
         _itemKeyCache get _className