From e422df8fc077e73974b8fb9f354b40aae39e3dd3 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sat, 11 Jan 2014 20:27:27 +0100 Subject: [PATCH] Push #941 - Morphine --- SQF/dayz_code/medical/morphine.sqf | 7 +++++-- SQF/dayz_code/medical/publicEH/medMorphine.sqf | 2 ++ SQF/dayz_server/compile/server_sendToClient.sqf | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/SQF/dayz_code/medical/morphine.sqf b/SQF/dayz_code/medical/morphine.sqf index f21d254ab..b5922d3e3 100644 --- a/SQF/dayz_code/medical/morphine.sqf +++ b/SQF/dayz_code/medical/morphine.sqf @@ -60,10 +60,13 @@ if (_finished) then { [player,50] call player_humanityChange; }; - //["usecMorphine",[_unit,player]] call broadcastRpcCallAll; - //DayZ CE: PublicVariables are removed in DayZ CE -> Could we also do here - Commit by Skaronator usecMorphine = [_unit,player]; publicVariable "usecMorphine"; + + /* WIP - PVS/PVC - Skaronator + PVDZE_send = [_unit,"Morphine",[_unit,player]]; + publicVariableServer "PVDZE_send"; + */ }; } else { r_interrupt = false; diff --git a/SQF/dayz_code/medical/publicEH/medMorphine.sqf b/SQF/dayz_code/medical/publicEH/medMorphine.sqf index 705c8e789..76c3bad95 100644 --- a/SQF/dayz_code/medical/publicEH/medMorphine.sqf +++ b/SQF/dayz_code/medical/publicEH/medMorphine.sqf @@ -18,6 +18,8 @@ if ((_unit == player) or (vehicle player != player)) then { _id = false spawn dayz_disableRespawn; }; + +/* WIP - PVS/PVC - Not anymore used: moved to server_sendToClient.sqf - Skaronator */ _unit setVariable ["hit_legs",0,false]; _unit setVariable ["hit_hands",0,false]; diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf index 05b28d110..d9403508b 100644 --- a/SQF/dayz_server/compile/server_sendToClient.sqf +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -48,7 +48,7 @@ switch (_variable) do { _unit setVariable["medForceUpdate",true]; }; - case "Painkiller": { + case "Painkiller": { //DONE usecPainK = _arraytosend; _owner publicVariableClient "usecPainK"; //Don't forget!! Checkout dayz_code\medical\publicEH\medPainkiller.sqf #13 @@ -56,8 +56,9 @@ switch (_variable) do { }; case "Morphine": { - PVCDZ_hlt_Morphine = _arraytosend; - _owner publicVariableClient "PVCDZ_hlt_Morphine"; + usecMorphine = _arraytosend; + _owner publicVariableClient "usecMorphine"; + //Don't forget!! Checkout dayz_code\medical\publicEH\medMorphine.sqf #22 _unit setVariable ["hit_legs",0,false]; _unit setVariable ["hit_hands",0,false]; _unit setVariable["medForceUpdate",true];