diff --git a/SQF/dayz_code/medical/bandage.sqf b/SQF/dayz_code/medical/bandage.sqf index 68675ac61..d4461221a 100644 --- a/SQF/dayz_code/medical/bandage.sqf +++ b/SQF/dayz_code/medical/bandage.sqf @@ -1,6 +1,6 @@ // bleed.sqf -private ["_started","_finished","_animState","_isMedic","_id","_unit"]; +private ["_started","_finished","_animState","_isMedic","_id","_unit","_display"]; disableserialization; @@ -54,16 +54,17 @@ if (_finished) then { _display closeDisplay 0; }; - //DayZ CE: Has been changed to PVC via server_sendToClient.sqf -> Could we also do here - Commit by Skaronator - usecBandage = [_unit,player]; - publicVariable "usecBandage"; - if ((_unit == player) or (vehicle player != player)) then { //Self Healing _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf"; dayz_sourceBleeding = objNull; } else { - //PVDZE_plr_HumanityChange = [player,20]; + usecBandage = [_unit,player]; + publicVariable "usecBandage"; + /* WIP - PVS/PVC - Skaronator + PVDZE_send = [_unit,"Bandage",[_unit,player]]; + publicVariableServer "PVDZE_send"; + */ [player,20] call player_humanityChange; }; diff --git a/SQF/dayz_code/medical/publicEH/medBandaged.sqf b/SQF/dayz_code/medical/publicEH/medBandaged.sqf index 5a5f0ea03..0fedeaa72 100644 --- a/SQF/dayz_code/medical/publicEH/medBandaged.sqf +++ b/SQF/dayz_code/medical/publicEH/medBandaged.sqf @@ -17,6 +17,8 @@ if ((_unit == player) or (vehicle player != player)) then { _control = _display displayCtrl 1303; _control ctrlShow false; }; + +/* WIP - PVS/PVC - Not anymore used: moved to server_sendToClient.sqf - Skaronator */ if (isServer) then { _unit setVariable["medForceUpdate",true]; }; \ No newline at end of file diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf index 0519847ff..4318403fa 100644 --- a/SQF/dayz_server/compile/server_sendToClient.sqf +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -55,7 +55,7 @@ switch (_variable) do { _unit setVariable["medForceUpdate",true]; }; - case "Morphine": { + case "Morphine": { //DONE usecMorphine = _arraytosend; _owner publicVariableClient "usecMorphine"; //Don't forget!! Checkout dayz_code\medical\publicEH\medMorphine.sqf #22 @@ -64,20 +64,18 @@ switch (_variable) do { _unit setVariable["medForceUpdate",true]; }; - case "Epinephrine": { + case "Epinephrine": { //DONE usecEpi = _arraytosend; _owner publicVariableClient "usecEpi"; //Don't forget!! Checkout dayz_code\medical\publicEH\medEpi.sqf #24 _unit setVariable["medForceUpdate",true]; }; - case "Bandage": { - PVCDZ_hlt_Bandage = _arraytosend; - _owner publicVariableClient "PVCDZ_hlt_Bandage"; - + case "Bandage": { //DONE + usecBandage = _arraytosend; + _owner publicVariableClient "usecBandage"; + //Don't forget!! Checkout dayz_code\medical\publicEH\medEpi.sqf #21 _unit setVariable["medForceUpdate",true]; - - //diag_log ("Bandage: " +str(PVCDZ_hlt_Bandage)); }; case "Antibiotics": {