diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 634576c6e..e68667df9 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -1,9 +1,8 @@ private ["_display","_body","_playerID","_array","_source","_method","_canHitFree","_isBandit","_punishment","_humanityHit","_myKills","_humanity","_kills","_killsV","_myGroup"]; disableSerialization; if (deathHandled) exitWith {}; - deathHandled = true; -//Death + //Prevent client freezes _display = findDisplay 49; if(!isNull _display) then {_display closeDisplay 0;}; @@ -12,13 +11,18 @@ if (visibleMap) then {openMap false;}; _body = player; _playerID = getPlayerUID player; + disableUserInput true; //add weapon on back to player... //if (dayz_onBack != "") then { // _body addWeapon dayz_onBack; //}; -//Send Death Notice -PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID]; + +_infected = 0; +if (r_player_infected && DZE_PlayerZed) then { + _infected = 1; +}; +PVDZE_plr_Died = [dayz_characterID,_infected,_body,_playerID]; publicVariableServer "PVDZE_plr_Died"; _id = [player,20,true,getPosATL player] call player_alertZombies; @@ -32,7 +36,6 @@ player setVariable ["NORRN_unconscious", false, true]; player setVariable ["unconsciousTime", 0, true]; player setVariable ["USEC_isCardiac",false,true]; player setVariable ["medForceUpdate",true,true]; -//remove combat timer on death player setVariable ["startcombattimer", 0]; r_player_unconscious = false; r_player_cardiac = false; @@ -64,20 +67,12 @@ if (count _array > 0) then { }; terminate dayz_musicH; -//terminate dayz_lootCheck; terminate dayz_slowCheck; terminate dayz_animalCheck; terminate dayz_monitor1; terminate dayz_medicalH; terminate dayz_gui; -//terminate dayz_zedCheck; -//terminate dayz_locationCheck; -//terminate dayz_combatCheck; -//terminate dayz_spawnCheck; -//Reset (just in case) -//deleteVehicle dayz_playerTrigger; -//disableUserInput false; r_player_dead = true; "dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [4]; "dynamicBlur" ppEffectCommit 0.2; diff --git a/SQF/dayz_server/compile/server_playerDied.sqf b/SQF/dayz_server/compile/server_playerDied.sqf index f09bffdc8..7bca73837 100644 --- a/SQF/dayz_server/compile/server_playerDied.sqf +++ b/SQF/dayz_server/compile/server_playerDied.sqf @@ -1,9 +1,10 @@ -private ["_characterID","_minutes","_newObject","_playerID","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record"]; +private ["_characterID","_minutes","_newObject","_playerID","_infected","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record"]; //[unit, weapon, muzzle, mode, ammo, magazine, projectile] _characterID = _this select 0; _minutes = _this select 1; _newObject = _this select 2; _playerID = _this select 3; +_infected = _this select 4; _victimName = name _newObject; _victim = _newObject; @@ -84,7 +85,7 @@ diag_log ("PDEATH: Player Died " + _playerID); if (_characterID != "0") then { - _key = format["CHILD:202:%1:%2:%3:",_characterID,_minutes,0]; + _key = format["CHILD:202:%1:%2:%3:",_characterID,_minutes,_infected]; #ifdef DZE_SERVER_DEBUG_HIVE diag_log ("HIVE: WRITE: "+ str(_key)); #endif