From 450990282265f70d12ee7e4d127c46f62c4109a6 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 2 Oct 2016 13:25:55 -0400 Subject: [PATCH] Remove source object from Humanity hit network send Source object is always player and not needed anymore after 8ea21a2 --- SQF/dayz_code/compile/fn_damageHandler.sqf | 2 +- SQF/dayz_code/compile/player_death.sqf | 2 +- SQF/dayz_code/compile/player_humanityChange.sqf | 7 +++---- SQF/dayz_code/medical/antibiotics.sqf | 2 +- SQF/dayz_code/medical/bandage.sqf | 2 +- SQF/dayz_code/medical/brokeBones.sqf | 2 +- SQF/dayz_code/medical/epinephrine.sqf | 2 +- SQF/dayz_code/medical/morphine.sqf | 2 +- SQF/dayz_code/medical/painkiller.sqf | 2 +- SQF/dayz_code/medical/transfusion.sqf | 2 +- SQF/dayz_code/system/player_spawn_2.sqf | 6 +++--- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf index 09e0619c6..fe12f4296 100644 --- a/SQF/dayz_code/compile/fn_damageHandler.sqf +++ b/SQF/dayz_code/compile/fn_damageHandler.sqf @@ -116,7 +116,7 @@ if (_unit == player) then { private ["_source","_humanityHit"]; _source = _this select 0; _humanityHit = _this select 1; - PVDZ_send = [_source,"Humanity",[_source,_humanityHit,30]]; + PVDZ_send = [_source,"Humanity",[_humanityHit,30]]; publicVariableServer "PVDZ_send"; }; }; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 4fb45eada..08b05cf63 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -95,7 +95,7 @@ if (count _array > 0) then { _humanityHit = -(2000 - _myKills); _kills = _source getVariable ["humanKills",0]; _source setVariable ["humanKills",(_kills + 1),true]; - PVDZ_send = [_source,"Humanity",[_source,_humanityHit,300]]; + PVDZ_send = [_source,"Humanity",[_humanityHit,300]]; publicVariableServer "PVDZ_send"; } else { //i'm "guilty" - kill me as bandit diff --git a/SQF/dayz_code/compile/player_humanityChange.sqf b/SQF/dayz_code/compile/player_humanityChange.sqf index 99c1b36e1..92f9d8d4b 100644 --- a/SQF/dayz_code/compile/player_humanityChange.sqf +++ b/SQF/dayz_code/compile/player_humanityChange.sqf @@ -1,7 +1,6 @@ -private ["_object","_change","_wait","_humanity","_model","_isMen","_isMenH","_isMenB","_isWomen","_isWomenH","_isWomenB"]; -_object = _this select 0; -_change = _this select 1; -_wait = if (count _this > 2) then { _this select 2 } else { 0 }; +private ["_change","_wait","_humanity","_model","_isMen","_isMenH","_isMenB","_isWomen","_isWomenH","_isWomenB"]; +_change = _this select 0; +_wait = _this select 1; _humanity = (player getVariable["humanity",0]) + _change; player setVariable["humanity",_humanity,true]; diff --git a/SQF/dayz_code/medical/antibiotics.sqf b/SQF/dayz_code/medical/antibiotics.sqf index 7a6c3e92c..a21ffe537 100644 --- a/SQF/dayz_code/medical/antibiotics.sqf +++ b/SQF/dayz_code/medical/antibiotics.sqf @@ -45,7 +45,7 @@ if (_hasAntibiotics) then { publicVariableServer "PVDZ_send"; //Give humnaity for good deeds - [player,20] call player_humanityChange; + [20,0] call player_humanityChange; _msg = "str_actions_medical_gave_antibiotics"; }; diff --git a/SQF/dayz_code/medical/bandage.sqf b/SQF/dayz_code/medical/bandage.sqf index 160977c43..480743cfb 100644 --- a/SQF/dayz_code/medical/bandage.sqf +++ b/SQF/dayz_code/medical/bandage.sqf @@ -55,7 +55,7 @@ if (_finished) then { } else { PVDZ_send = [_unit,"Bandage",[_unit,player]]; publicVariableServer "PVDZ_send"; - [player,20] call player_humanityChange; + [20,0] call player_humanityChange; }; } else { r_interrupt = false; diff --git a/SQF/dayz_code/medical/brokeBones.sqf b/SQF/dayz_code/medical/brokeBones.sqf index 752fe929d..42cc2d162 100644 --- a/SQF/dayz_code/medical/brokeBones.sqf +++ b/SQF/dayz_code/medical/brokeBones.sqf @@ -51,7 +51,7 @@ if (_finished) then { //Give humanity reward to player giving the morphine to another player. if (_item in ["ItemMorphine"]) then { - [player,50] call player_humanityChange; + [50,0] call player_humanityChange; }; }; diff --git a/SQF/dayz_code/medical/epinephrine.sqf b/SQF/dayz_code/medical/epinephrine.sqf index e0ce39a5a..203c7a655 100644 --- a/SQF/dayz_code/medical/epinephrine.sqf +++ b/SQF/dayz_code/medical/epinephrine.sqf @@ -14,7 +14,7 @@ if (!_isDead) then { uiSleep 5; //give humanity - [player,25] call player_humanityChange; + [25,0] call player_humanityChange; PVDZ_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]]; publicVariableServer "PVDZ_send"; diff --git a/SQF/dayz_code/medical/morphine.sqf b/SQF/dayz_code/medical/morphine.sqf index 3010f595b..8826178e2 100644 --- a/SQF/dayz_code/medical/morphine.sqf +++ b/SQF/dayz_code/medical/morphine.sqf @@ -46,7 +46,7 @@ if ((_unit == player) or (vehicle player != player)) then { _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf"; } else { //PVCDZ_plr_Humanity = [player,50]; - [player,50] call player_humanityChange; + [50,0] call player_humanityChange; }; //["PVCDZ_hlt_Morphine",[_unit,player]] call broadcastRpcCallAll; diff --git a/SQF/dayz_code/medical/painkiller.sqf b/SQF/dayz_code/medical/painkiller.sqf index 18000e4fd..74eb6d3e8 100644 --- a/SQF/dayz_code/medical/painkiller.sqf +++ b/SQF/dayz_code/medical/painkiller.sqf @@ -16,7 +16,7 @@ if ((_unit == player) or (vehicle player != player)) then { _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf"; } else { //PVCDZ_plr_Humanity = [player,20]; - [player,20] call player_humanityChange; + [20,0] call player_humanityChange; }; player removeMagazine "ItemPainkiller"; diff --git a/SQF/dayz_code/medical/transfusion.sqf b/SQF/dayz_code/medical/transfusion.sqf index cb8459c80..58f8aeccf 100644 --- a/SQF/dayz_code/medical/transfusion.sqf +++ b/SQF/dayz_code/medical/transfusion.sqf @@ -194,7 +194,7 @@ while {r_doLoop} do { localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages; //see Note 1 //[player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_successful","PLAIN DOWN"] call RE; - if (!_badBag and _bagFound) then { [player,_humanityAwarded] call player_humanityChange; }; + if (!_badBag and _bagFound) then { [_humanityAwarded,0] call player_humanityChange; }; r_doLoop = false; }; diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index f03e0d971..8d460c770 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -23,7 +23,7 @@ _timerMonitor = diag_ticktime; player setVariable ["temperature",dayz_temperatur,true]; player setVariable["friendlies",DZE_Friends,true]; -[player,0] call player_humanityChange; +[0,0] call player_humanityChange; //player addMagazine "Hatchet_swing"; //player addWeapon "MeleeHatchet"; @@ -79,7 +79,7 @@ while {1 == 1} do { _humanity = player getVariable ["humanity",0]; if (_humanity < 1 or _forceHumanity) then { if (vehicle player != player) then { - [player, round(_timeOut / 10)] call player_humanityChange; + [round(_timeOut / 10),0] call player_humanityChange; _forceHumanity = false; } else { _humanity = _humanity + round(_timeOut / 10); @@ -93,7 +93,7 @@ while {1 == 1} do { /* if ((Dayz_loginCompleted) && (diag_tickTime < 25)) then { - [player,0] call player_humanityChange; + [0,0] call player_humanityChange; diag_log ("Running"); _timer10 = diag_Ticktime;