From 326e758d2959f9777b494269f67d2be68ac7d534 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sat, 18 Jan 2014 16:02:00 +0100 Subject: [PATCH] Fix #991 (DayZ Mod 1.8 Way) --- SQF/dayz_code/compile/player_death.sqf | 2 +- SQF/dayz_code/compile/player_switchModel.sqf | 12 ++++++------ SQF/dayz_server/compile/server_playerDied.sqf | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 1542311b3..440037395 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -14,7 +14,7 @@ if (r_player_infected) then { //Send Death Notice //["PVDZE_plr_Died",[dayz_characterID,0,_body,_playerID,dayz_playerName,_infected]] call callRpcProcedure; -PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID,dayz_playerName,_infected]; +PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID,_infected]; publicVariableServer "PVDZE_plr_Died"; _id = [player,20,true,getPosATL player] spawn player_alertZombies; diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 1a2c16a96..c3716dc0b 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -61,9 +61,9 @@ player setPosATL dayz_spawnPos; //BackUp Player Object _oldUnit = player; -/***********************************/ -//DONT USE player AFTER THIS POINT -/***********************************/ +/**********************************/ +//DONT USE player AFTER THIS POINT// +/**********************************/ //Create New Character //[player] joinSilent grpNull; @@ -150,16 +150,16 @@ if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;}; //dayz_originalPlayer attachTo [_newUnit]; player disableConversation true; -player setVariable ["bodyName",dayz_playerName,true]; +//player setVariable ["bodyName",dayz_playerName,true]; //Outcommit (Issue #991) - Also removed in DayZ Mod 1.8 if (_tagSetting) then { DZE_ForceNameTags = true; }; -_playerUID=getPlayerUID player; +_playerUID = getPlayerUID player; _playerObjName = format["player%1",_playerUID]; call compile format["%1 = player;",_playerObjName]; -publicVariable _playerObjName; +publicVariable _playerObjName; //Outcommit in DayZ 1.8 No clue for what this is - Skaronator //melee check _wpnType = primaryWeapon player; diff --git a/SQF/dayz_server/compile/server_playerDied.sqf b/SQF/dayz_server/compile/server_playerDied.sqf index 27761fc1d..b31f34e6b 100644 --- a/SQF/dayz_server/compile/server_playerDied.sqf +++ b/SQF/dayz_server/compile/server_playerDied.sqf @@ -1,14 +1,14 @@ -private ["_characterID","_minutes","_newObject","_playerID","_playerName","_infected","_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; -_playerName = _this select 4; -_infected = _this select 5; +_infected = _this select 4; +_victimName = name _newObject; _victim = _newObject; -_victimName = _victim getVariable["bodyName", "nil"]; +_newObject setVariable ["bodyName", _victimName, true]; _killer = _victim getVariable["AttackedBy", "nil"]; _killerName = _victim getVariable["AttackedByName", "nil"];