Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve - medic param to remaining treatment EHs #10186

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_bandage.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "", "", "_bandageEf

[_patient, "activity", LSTRING(Activity_bandagedPatient), [[_medic, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);

[QGVAR(bandageLocal), [_patient, _bodyPart, _classname, _bandageEffectiveness], _patient] call CBA_fnc_targetEvent;
[QGVAR(bandageLocal), [_patient, _bodyPart, _classname, _bandageEffectiveness, _medic], _patient] call CBA_fnc_targetEvent;
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_ivBag.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];
[_patient, _usedItem] call FUNC(addToTriageCard);
[_patient, "activity", LSTRING(Activity_gaveIV), [[_medic, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);

[QGVAR(ivBagLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
[QGVAR(ivBagLocal), [_patient, _bodyPart, _classname, _medic], _patient] call CBA_fnc_targetEvent;
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_medication.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"];
private _cfg = ["CfgWeapons", "CfgMagazines"] select (isClass (configFile >> "CfgMagazines" >> _usedItem));
[_patient, "activity", LSTRING(Activity_usedItem), [[_medic, false, true] call EFUNC(common,getName), getText (configFile >> _cfg >> _usedItem >> "displayName")]] call FUNC(addToLog);

[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent;
[QGVAR(medicationLocal), [_patient, _bodyPart, _classname, _medic], _patient] call CBA_fnc_targetEvent;
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_tourniquet.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ if ([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo)) exitWith {
[_patient, _usedItem] call FUNC(addToTriageCard);
[_patient, "activity", LSTRING(Activity_appliedTourniquet), [[_medic, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);

[QGVAR(tourniquetLocal), [_patient, _bodyPart], _patient] call CBA_fnc_targetEvent;
[QGVAR(tourniquetLocal), [_patient, _bodyPart, _medic], _patient] call CBA_fnc_targetEvent;
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private _arrayModified = false;

if (_partIndex == _bodyPartN) then {
TRACE_1("delayed medication call after tourniquet removeal",_x);
[QGVAR(medicationLocal), [_patient, _bodyPart, _medication], _patient] call CBA_fnc_targetEvent;
[QGVAR(medicationLocal), [_patient, _bodyPart, _medication, _medic], _patient] call CBA_fnc_targetEvent;
_occludedMedications set [_forEachIndex, []];
_arrayModified = true;
};
Expand Down