From f233cfce8446f698295141d459b3daf0f067cb1b Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sun, 12 Jan 2014 16:08:06 +0100 Subject: [PATCH] =?UTF-8?q?Finalized=20#941=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQF/dayz_code/init/publicEH.sqf | 3 -- .../medical/publicEH/medBandaged.sqf | 5 ---- SQF/dayz_code/medical/publicEH/medEpi.sqf | 5 ---- .../medical/publicEH/medMorphine.sqf | 8 ----- .../medical/publicEH/medPainkiller.sqf | 4 --- .../medical/publicEH/medTransfuse.sqf | 6 +--- .../compile/server_sendToClient.sqf | 29 ++++++++----------- 7 files changed, 13 insertions(+), 47 deletions(-) diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index 5bf985a03..c5f76018e 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -25,11 +25,8 @@ "PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH}; "PVDZE_plr_HumanityChange" addPublicVariableEventHandler {(_this select 1) spawn player_humanityChange}; "PVDZE_serverObjectMonitor" addPublicVariableEventHandler {PVDZE_serverObjectMonitor = dayz_safety}; - /* PVS/PVC - Skaronator */ "PVCDZE_vehSH" addPublicVariableEventHandler {(_this select 1) call vehicle_handleDamage}; // set damage to vehicle part -"PVCDZE_hideBody" addPublicVariableEventHandler {hideBody (_this select 1)}; - //Server only if (isServer) then { diff --git a/SQF/dayz_code/medical/publicEH/medBandaged.sqf b/SQF/dayz_code/medical/publicEH/medBandaged.sqf index 0fedeaa72..183daf338 100644 --- a/SQF/dayz_code/medical/publicEH/medBandaged.sqf +++ b/SQF/dayz_code/medical/publicEH/medBandaged.sqf @@ -16,9 +16,4 @@ if ((_unit == player) or (vehicle player != player)) then { _display = uiNamespace getVariable 'DAYZ_GUI_display'; _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_code/medical/publicEH/medEpi.sqf b/SQF/dayz_code/medical/publicEH/medEpi.sqf index 28526502d..c8ed6a984 100644 --- a/SQF/dayz_code/medical/publicEH/medEpi.sqf +++ b/SQF/dayz_code/medical/publicEH/medEpi.sqf @@ -20,9 +20,4 @@ if (!_isDead) then { r_player_cardiac = false; r_player_handler1 = 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_code/medical/publicEH/medMorphine.sqf b/SQF/dayz_code/medical/publicEH/medMorphine.sqf index 76c3bad95..cb5d18d52 100644 --- a/SQF/dayz_code/medical/publicEH/medMorphine.sqf +++ b/SQF/dayz_code/medical/publicEH/medMorphine.sqf @@ -17,12 +17,4 @@ if ((_unit == player) or (vehicle player != player)) then { _control ctrlShow false; _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]; - -if (isServer) then { - _unit setVariable["medForceUpdate",true]; }; \ No newline at end of file diff --git a/SQF/dayz_code/medical/publicEH/medPainkiller.sqf b/SQF/dayz_code/medical/publicEH/medPainkiller.sqf index 2b449d230..2422b3c9d 100644 --- a/SQF/dayz_code/medical/publicEH/medPainkiller.sqf +++ b/SQF/dayz_code/medical/publicEH/medPainkiller.sqf @@ -9,8 +9,4 @@ if ((_unit == player) or (vehicle player != player)) then { r_player_inpain = false; R3F_TIRED_Accumulator = 0; "dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5; -}; -/* 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_code/medical/publicEH/medTransfuse.sqf b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf index f6c1d1d1c..69b94d2ec 100644 --- a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf +++ b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf @@ -26,8 +26,4 @@ if (_unit == player) then { _control ctrlShow true; player setVariable["USEC_BloodQty",r_player_bloodTotal,true]; -}; -/* 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 6cc189900..94eb3191a 100644 --- a/SQF/dayz_server/compile/server_sendToClient.sqf +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -10,7 +10,7 @@ _owner = owner _unit; //execution switch (_variable) do { - case "VehHandleDam": { //DONE + case "VehHandleDam": { _vehicle = _arraytosend select 0; if (local _vehicle) then { _arraytosend call fnc_veh_handleDam; @@ -20,7 +20,7 @@ switch (_variable) do { }; }; - case "SetFuel": { //DONE + case "SetFuel": { _vehicle = _arraytosend select 0; _qty = _arraytosend select 1; if (local _vehicle) then { @@ -31,53 +31,48 @@ switch (_variable) do { }; }; - case "HideBody": { //DONE - PVCDZE_hideBody = _arraytosend select 0; - _owner publicVariableClient "PVCDZE_hideBody"; + case "HideBody": { + PVDZE_plr_HideBody = _arraytosend select 0; + _owner publicVariableClient "PVDZE_plr_HideBody"; }; - case "Humanity": { //DONE + case "Humanity": { PVDZE_plr_HumanityChange = _arraytosend; _owner publicVariableClient "PVDZE_plr_HumanityChange"; }; - case "Transfuse": { //DONE + case "Transfuse": { usecTransfuse = _arraytosend; _owner publicVariableClient "usecTransfuse"; - //Don't forget!! Checkout dayz_code\medical\publicEH\medTransfuse.sqf #30 _unit setVariable["medForceUpdate",true]; }; - case "Painkiller": { //DONE + case "Painkiller": { usecPainK = _arraytosend; _owner publicVariableClient "usecPainK"; - //Don't forget!! Checkout dayz_code\medical\publicEH\medPainkiller.sqf #13 _unit setVariable["medForceUpdate",true]; }; - case "Morphine": { //DONE + case "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]; }; - case "Epinephrine": { //DONE + case "Epinephrine": { usecEpi = _arraytosend; _owner publicVariableClient "usecEpi"; - //Don't forget!! Checkout dayz_code\medical\publicEH\medEpi.sqf #24 _unit setVariable["medForceUpdate",true]; }; - case "Bandage": { //DONE + case "Bandage": { usecBandage = _arraytosend; _owner publicVariableClient "usecBandage"; - //Don't forget!! Checkout dayz_code\medical\publicEH\medEpi.sqf #21 _unit setVariable["medForceUpdate",true]; }; - case "tagFriendly": { //DONE + case "tagFriendly": { PVDZE_plr_FriendRQ = _arraytosend; _owner publicVariableClient "PVDZE_plr_FriendRQ"; };