diff --git a/SQF/dayz_code/actions/study_body.sqf b/SQF/dayz_code/actions/study_body.sqf index 2c48042cd..b86762165 100644 --- a/SQF/dayz_code/actions/study_body.sqf +++ b/SQF/dayz_code/actions/study_body.sqf @@ -1,8 +1,9 @@ -private["_body","_name","_method","_methodStr"]; +private["_body","_name","_method","_methodStr","_bodyName"]; _body = _this select 3; -_name = _body getVariable["bodyName","unknown"]; +_bodyName = toArray "unknown"; +_name = _body getVariable["bodyName",_bodyName]; _method = _body getVariable["deathType","unknown"]; _methodStr = localize format ["str_death_%1",_method]; -cutText [format[(localize "str_player_studybody"),_name,_methodStr], "PLAIN DOWN"]; +cutText [format[(localize "str_player_studybody"),toString(_name),_methodStr], "PLAIN DOWN"]; diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 1a2c16a96..aa6e4b1c0 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -150,7 +150,7 @@ if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;}; //dayz_originalPlayer attachTo [_newUnit]; player disableConversation true; -player setVariable ["bodyName",dayz_playerName,true]; +player setVariable ["bodyName",(toArray dayz_playerName),true]; if (_tagSetting) then { DZE_ForceNameTags = true; diff --git a/SQF/dayz_server/compile/server_playerDied.sqf b/SQF/dayz_server/compile/server_playerDied.sqf index 90d9f97d8..d20391aa2 100644 --- a/SQF/dayz_server/compile/server_playerDied.sqf +++ b/SQF/dayz_server/compile/server_playerDied.sqf @@ -1,4 +1,4 @@ -private ["_characterID","_minutes","_newObject","_playerID","_playerName","_infected","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record"]; +private ["_characterID","_minutes","_newObject","_playerID","_playerName","_infected","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record","_victimArray","_victimNameArray"]; //[unit, weapon, muzzle, mode, ammo, magazine, projectile] _characterID = _this select 0; _minutes = _this select 1; @@ -8,8 +8,9 @@ _playerName = toString(_this select 4); _infected = _this select 5; _victim = _newObject; -_victimName = _victim getVariable["bodyName", "nil"]; - +_victimArray = toArray "nil"; +_victimNameArray = _victim getVariable["bodyName", _victimArray]; +_victimName = toString (_victimNameArray); _killer = _victim getVariable["AttackedBy", "nil"]; _killerName = _victim getVariable["AttackedByName", "nil"];