General - Fix undefined variables (KAT-Advanced-Medical#760)

MiszczuZPolski · web-flow · commit 8f69dae10a6d · 2025-04-28T08:56:26.000-07:00
**When merged this pull request will:** - Title ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
diff --git a/addons/airway/XEH_postInit.sqf b/addons/airway/XEH_postInit.sqf
@@ -2,9 +2,7 @@
 
 if !(GVAR(enable)) exitWith {};
 
-[QGVAR(larynxLocal), LINKFUNC(treatmentAdvanced_larynxLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(airwayLocal), LINKFUNC(treatmentAdvanced_airwayLocal)] call CBA_fnc_addEventHandler;
-[QGVAR(guedelLocal), LINKFUNC(treatmentAdvanced_guedelLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(accuvacLocal), LINKFUNC(treatmentAdvanced_accuvacLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(recoveryPositionLocal), LINKFUNC(treatmentAdvanced_RecoveryPositionLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(cancelRecoveryPositionLocal), LINKFUNC(treatmentAdvanced_CancelRecoveryPositionLocal)] call CBA_fnc_addEventHandler;
diff --git a/addons/breathing/XEH_postInit.sqf b/addons/breathing/XEH_postInit.sqf
@@ -5,7 +5,6 @@
 [QGVAR(handleBreathing), LINKFUNC(handleBreathing)] call CBA_fnc_addEventHandler;
 [QGVAR(hemopneumothoraxLocal), LINKFUNC(treatmentAdvanced_hemopneumothoraxLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(tensionpneumothoraxLocal), LINKFUNC(treatmentAdvanced_tensionpneumothoraxLocal)] call CBA_fnc_addEventHandler;
-[QGVAR(cyanosisLocal), LINKFUNC(treatmentAdvanced_CyanosisLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(nasalCannulaLocal), LINKFUNC(treatmentAdvanced_nasalCannulaLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(removeNasalCannulaLocal), LINKFUNC(treatmentAdvanced_removeNasalCannulaLocal)] call CBA_fnc_addEventHandler;
 
diff --git a/addons/breathing/functions/fnc_attachPersonalOxygen.sqf b/addons/breathing/functions/fnc_attachPersonalOxygen.sqf
@@ -65,7 +65,7 @@ _patient setVariable [QGVAR(oxygenMaskStatus), [(_largestTankValue + 1), 1], tru
         _pfhID call CBA_fnc_removePerFrameHandler;
     };
 
-    if !(_patient setVariable [QGVAR(oxygenMaskActive), true]) exitWith {
+    if !(_patient getVariable [QGVAR(oxygenMaskActive), true]) exitWith {
         _pfhID call CBA_fnc_removePerFrameHandler;
     };
 
diff --git a/addons/chemical/functions/fnc_enableChemDetector.sqf b/addons/chemical/functions/fnc_enableChemDetector.sqf
@@ -31,7 +31,7 @@ _unit setVariable [QGVAR(detectorEnabled), true, true];
 
     if !("KAT_ChemicalDetector" in assignedItems _unit) exitWith {
         _unit setVariable [QGVAR(detectorEnabled), false, true];
-        _pfhID call CBA_fnc_removePerFrameHandler;
+        _idPFH call CBA_fnc_removePerFrameHandler;
     };
 
     private _detectorSound = _unit getVariable [QGVAR(detectorSound), false];
diff --git a/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf b/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf
@@ -336,9 +336,9 @@ GVAR(PulseRateReady) = true;
 
     isNull _dlg || GVAR(AEDX_MonitorTarget) getVariable [QGVAR(Defibrillator_Charged), false];
 }, {
-    params ["_dlg", "_chargeBar"];
+    params ["_dlg"];
 
     if !(isNull _dlg) then {
         [true] call FUNC(AEDX_ViewMonitor_Charging);
     };
-}, [_dlg, _chargeBar], 4, {}] call CBA_fnc_waitUntilAndExecute;
+}, [_dlg], 4, {}] call CBA_fnc_waitUntilAndExecute;
diff --git a/addons/circulation/functions/fnc_addDefibrillatorActions.sqf b/addons/circulation/functions/fnc_addDefibrillatorActions.sqf
@@ -59,6 +59,9 @@ switch (_type) do { // AED-X pads
                     [_medic, _patient, "rightarm", "AEDXStationConnectVitalsMonitor", [_defibObject]] call EFUNC(misc,treatment);
                 },
                 {
+                    params ["_medic", "", "_args"];
+                    _args params ["_patient", "_defibObject"];
+                    
                     [_medic, _patient, "rightarm", "AEDXStationConnectVitalsMonitor", [_defibObject]] call ACEFUNC(medical_treatment,canTreat);
                 },
                 {
diff --git a/addons/circulation/functions/fnc_handleCardiacArrest.sqf b/addons/circulation/functions/fnc_handleCardiacArrest.sqf
@@ -57,7 +57,7 @@ if (_initial) then {
         _cardiacArrestType = 2;
     };
 
-    private _nitroCount = ([_patient, "Nitroglycerin", false] call ACEFUNC(medical_status,getMedicationCount)) select 1;
+    private _nitroCount = ([_unit, "Nitroglycerin", false] call ACEFUNC(medical_status,getMedicationCount)) select 1;
 
     if ((_nitroCount < 0.5) && ((random 3) < 1)) then {
         _cardiacArrestType = 2;
diff --git a/addons/hypothermia/functions/fnc_checkHandWarmers.sqf b/addons/hypothermia/functions/fnc_checkHandWarmers.sqf
@@ -4,18 +4,19 @@
  * Checks handwarmer status
  *
  * Arguments:
- * 0: Patient <OBJECT>
+ * 0: Player <OBJECT>
+ * 1: Target <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * [patient] call kat_hypothermia_fnc_checkHandWarmers;
+ * [player, cursorObject] call kat_hypothermia_fnc_checkHandWarmers;
  *
  * Public: No
  */
 
-params ["_target"];
+params ["_player", "_target"];
 
 private _warmers = _target getVariable [QGVAR(handWarmers), [0,0,0,0,0,0]];
 _warmers params ["_head", "_body", "_larm", "_rarm", "_lleg", "_rleg"];
diff --git a/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf b/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf
@@ -40,7 +40,7 @@ private _actions = [];
         },
         {},
         [_unit]
-        ] call ACEFUNC(interact_menu,createAction),[], _medic];
+        ] call ACEFUNC(interact_menu,createAction),[], _unit];
     };
 } forEach (_vehicleSeats);
 
diff --git a/addons/misc/functions/fnc_setUnconscious.sqf b/addons/misc/functions/fnc_setUnconscious.sqf
@@ -50,7 +50,7 @@ if (_knockOut) then {
             KAT_forceWakeup = true;
             [{
                 params [["_unit", objNull]];
-                if ((alive _unit) && {_unit call FUNC(hasStableVitals)}) then {
+                if ((alive _unit) && {_unit call EFUNC(vitals,hasStableVitals)}) then {
                     [QACEGVAR(medical,WakeUp), _unit] call CBA_fnc_localEvent;
                     KAT_forceWakeup = false;
                 } else {
diff --git a/addons/misc/functions/fnc_unSlingArmband.sqf b/addons/misc/functions/fnc_unSlingArmband.sqf
@@ -24,25 +24,25 @@ private _originalArmband = "";
 switch (_limbNumber) do {
     case 0: {
         _armbandObject = _unit getVariable [QGVAR(whichArmabndisSlingedLA), objNull]; 
-        _originalArmband = _unit getVariable [QGVAR(armbandVersionLA), _armbandVersion];
+        _originalArmband = _unit getVariable [QGVAR(armbandVersionLA), ""];
         _unit setVariable [QGVAR(isLeftArmFree), true, true];
     };
 
     case 1: {
         _armbandObject = _unit getVariable [QGVAR(whichArmabndisSlingedRA), objNull]; 
-        _originalArmband = _unit getVariable [QGVAR(armbandVersionRA), _armbandVersion];
+        _originalArmband = _unit getVariable [QGVAR(armbandVersionRA), ""];
         _unit setVariable [QGVAR(isRightArmFree), true, true];
     };
 
     case 2: {
         _armbandObject = _unit getVariable [QGVAR(whichArmabndisSlingedLL), objNull]; 
-        _originalArmband = _unit getVariable [QGVAR(armbandVersionLL), _armbandVersion];
+        _originalArmband = _unit getVariable [QGVAR(armbandVersionLL), ""];
         _unit setVariable [QGVAR(isLeftLegFree), true, true];
     };
 
     case 3: {
         _armbandObject = _unit getVariable [QGVAR(whichArmabndisSlingedRL), objNull]; 
-        _originalArmband = _unit getVariable [QGVAR(armbandVersionRL), _armbandVersion];
+        _originalArmband = _unit getVariable [QGVAR(armbandVersionRL), ""];
         _unit setVariable [QGVAR(isRightLegFree), true, true];
     };
 };
diff --git a/addons/misc/functions/fnc_useItem.sqf b/addons/misc/functions/fnc_useItem.sqf
@@ -87,10 +87,10 @@ if (GVAR(allowSharedVehicleEquipment) > 0 && _vehicleCondition) then {
         _originItems = [_origin, 2] call ACEFUNC(common,uniqueItems); // Magazine
         {
             if (_x in _originItems) then {
-                private _magsStart = count magazines _unit;
+                private _magsStart = count magazines _origin;
                 [_origin, _x] call ACEFUNC(common,adjustMagazineAmmo);
-                 private _magsEnd = count magazines _unit;
-                [_unit, _x, (_magsEnd < _magsStart)] breakOut "Main";
+                private _magsEnd = count magazines _origin;
+                [_origin, _x, (_magsEnd < _magsStart)] breakOut "Main";
             };
         } forEach _items;
     } else { // Remove vehicle item
diff --git a/addons/ophthalmology/XEH_postInit.sqf b/addons/ophthalmology/XEH_postInit.sqf
@@ -2,8 +2,6 @@
 
 if (!hasInterface) exitWith {};
 
-call FUNC(initKeybinds);
-
 ["CBA_settingsInitialized", {
     //If not enabled, dont't add
     if (!GVAR(enable)) exitWith {};
diff --git a/addons/ophthalmology/functions/fnc_treatmentAdvanced_eyeShield.sqf b/addons/ophthalmology/functions/fnc_treatmentAdvanced_eyeShield.sqf
@@ -41,7 +41,7 @@ private _fnc_applyEyeCover = {
     // Approximately 8 minutes to fully re-heal a damaged eye using the eyeshield
     [{
         params ["_args", "_pfhID"];
-        _args params ["_unit", "_activeEye"];
+        _args params ["_unit", "_activeEye", "_shieldItem"];
     
         if ((hmd _unit) != _shieldItem) exitWith {
             _pfhID call CBA_fnc_removePerFrameHandler;
@@ -52,7 +52,8 @@ private _fnc_applyEyeCover = {
         _unit setVariable [QGVAR(eyeInjuries), [(((_eyeInjury select 0) + 0.002) min 1), (_eyeInjury select 1)], true];
     }, 1, [
         _patient,
-        _activeEye
+        _activeEye,
+        _shieldItem
     ]] call CBA_fnc_addPerFrameHandler;
 };
 
diff --git a/addons/pharma/XEH_postInit.sqf b/addons/pharma/XEH_postInit.sqf
@@ -15,7 +15,6 @@
 [QGVAR(flushLocal), LINKFUNC(treatmentAdvanced_FlushLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(pervitinLocal), LINKFUNC(treatmentAdvanced_PervitinLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(pervitinPP), LINKFUNC(pervitinPP)] call CBA_fnc_addEventHandler;
-[QGVAR(ketamineLocal), LINKFUNC(treatmentAdvanced_KetamineLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(fentanylLocal), LINKFUNC(treatmentAdvanced_FentanylLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(caffeineLocal), LINKFUNC(treatmentAdvanced_CaffeineLocal)] call CBA_fnc_addEventHandler;
 
diff --git a/addons/pharma/functions/fnc_coagRegen.sqf b/addons/pharma/functions/fnc_coagRegen.sqf
@@ -34,7 +34,7 @@ if !(GVAR(coagulation)) exitWith {};
     };
 
     if (GET_BLOOD_VOLUME_LITERS(_unit) < GVAR(coagulation_requireBV)) exitWith {}; // Blood volume check
-    if ((_pulse < 20) && GVAR(coagulation_requireHR)) exitWith {}; // Has pulse & require setting
+    if ((GET_HEART_RATE(_unit) < 20) && GVAR(coagulation_requireHR)) exitWith {}; // Has pulse & require setting
 
     private _currentCoagFactors = _unit getVariable [QGVAR(coagulationFactor), 30];
     private _savedCoagFactors = _unit getVariable [QGVAR(coagulationSavedFactors), (_unit getVariable [QGVAR(coagulationFactor), 30])];
diff --git a/addons/pharma/functions/fnc_pervitinPP.sqf b/addons/pharma/functions/fnc_pervitinPP.sqf
@@ -19,10 +19,12 @@ params ["_target"];
 
 // CamShake effect
 [{
+    params ["_target"];
     if !(alive _target) exitWith {};
     [LLSTRING(Pervitin_chrom2), 2, _target] call ACEFUNC(common,displayTextStructured);
     addCamShake[1, 180, 2]; // wearoff after 9m
     [{
+        params ["_target"];
         [LLSTRING(Pervitin_chrom3), 2, _target] call ACEFUNC(common,displayTextStructured);
     },
     [_target], 180] call CBA_fnc_waitAndExecute;
diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf
@@ -32,13 +32,13 @@ if (_IVactual > 1) then {
     if (_IVactual != 4) exitWith {
         if (_randomNumber < GVAR(blockChance)) then {
             [{
-                params ["_patient", "_IVarray", "_partIndex"];
+                params ["_patient", "_IVarray", "_partIndex", "_IVactual"];
 
                 if (_IVactual > 1 && _IVactual != 4) exitWith {};
                 _IVarray set [_partIndex, 3];
                 _patient setVariable [QGVAR(IV), _IVarray, true];
             },
-            [_patient, _IVarray, _partIndex], (random 300)] call CBA_fnc_waitAndExecute;
+            [_patient, _IVarray, _partIndex, _IVactual], (random 300)] call CBA_fnc_waitAndExecute;
         };
     };
 
diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf
@@ -32,13 +32,13 @@ if (_IVactual > 1) then {
     if (_IVactual != 4) exitWith {
         if (_randomNumber < GVAR(blockChance)) then {
             [{
-                params["_patient", "_IVarray", "_partIndex"];
+                params ["_patient", "_IVarray", "_partIndex", "_IVactual"];
 
                 if (_IVactual > 1 && _IVactual != 4) exitWith {};
                 _IVarray set [_partIndex, 3];
                 _patient setVariable [QGVAR(IV), _IVarray, true];
             },
-            [_patient, _IVarray, _partIndex], (random 300)] call CBA_fnc_waitAndExecute;
+            [_patient, _IVarray, _partIndex, _IVactual], (random 300)] call CBA_fnc_waitAndExecute;
         };
     };
 

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ switch (_type) do { // AED-X pads`
`59`	`59`	`[_medic, _patient, "rightarm", "AEDXStationConnectVitalsMonitor", [_defibObject]] call EFUNC(misc,treatment);`
`60`	`60`	`},`
`61`	`61`	`{`
	`62`	`+ params ["_medic", "", "_args"];`
	`63`	`+ _args params ["_patient", "_defibObject"];`
	`64`	`+`
`62`	`65`	`[_medic, _patient, "rightarm", "AEDXStationConnectVitalsMonitor", [_defibObject]] call ACEFUNC(medical_treatment,canTreat);`
`63`	`66`	`},`
`64`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,19 @@`
`4`	`4`	`* Checks handwarmer status`
`5`	`5`	`*`
`6`	`6`	`* Arguments:`
`7`		`- * 0: Patient <OBJECT>`
	`7`	`+ * 0: Player <OBJECT>`
	`8`	`+ * 1: Target <OBJECT>`
`8`	`9`	`*`
`9`	`10`	`* Return Value:`
`10`	`11`	`* None`
`11`	`12`	`*`
`12`	`13`	`* Example:`
`13`		`- * [patient] call kat_hypothermia_fnc_checkHandWarmers;`
	`14`	`+ * [player, cursorObject] call kat_hypothermia_fnc_checkHandWarmers;`
`14`	`15`	`*`
`15`	`16`	`* Public: No`
`16`	`17`	`*/`
`17`	`18`
`18`		`-params ["_target"];`
	`19`	`+params ["_player", "_target"];`
`19`	`20`
`20`	`21`	`private _warmers = _target getVariable [QGVAR(handWarmers), [0,0,0,0,0,0]];`
`21`	`22`	`_warmers params ["_head", "_body", "_larm", "_rarm", "_lleg", "_rleg"];`