W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "More Fixes #991"

Browse Source 
This reverts commit 7d15cfb1bf.
This commit is contained in:
Skaronator
2014-01-18 14:49:44 +01:00
parent 91c7ddf829
commit a3fd8bd1ca
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SQF/dayz_code/actions/study_body.sqf
View File

@@ -1,9 +1,8 @@
private["_body","_name","_method","_methodStr","_bodyName"]; private["_body","_name","_method","_methodStr"];
_body = _this select 3; _body = _this select 3;
_bodyName = toArray "unknown"; _name = _body getVariable["bodyName","unknown"];
_name = _body getVariable["bodyName",_bodyName];
_method = _body getVariable["deathType","unknown"]; _method = _body getVariable["deathType","unknown"];
_methodStr = localize format ["str_death_%1",_method]; _methodStr = localize format ["str_death_%1",_method];
cutText [format[(localize "str_player_studybody"),toString(_name),_methodStr], "PLAIN DOWN"]; cutText [format[(localize "str_player_studybody"),_name,_methodStr], "PLAIN DOWN"];

2
SQF/dayz_code/compile/player_switchModel.sqf
View File

@@ -150,7 +150,7 @@ if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
//dayz_originalPlayer attachTo [_newUnit]; //dayz_originalPlayer attachTo [_newUnit];
player disableConversation true; player disableConversation true;
player setVariable ["bodyName",(toArray dayz_playerName),true]; player setVariable ["bodyName",dayz_playerName,true];
if (_tagSetting) then { if (_tagSetting) then {
DZE_ForceNameTags = true; DZE_ForceNameTags = true;

7
SQF/dayz_server/compile/server_playerDied.sqf
View File

@@ -1,4 +1,4 @@
private ["_characterID","_minutes","_newObject","_playerID","_playerName","_infected","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record","_victimArray","_victimNameArray"]; private ["_characterID","_minutes","_newObject","_playerID","_playerName","_infected","_victim","_victimName","_killer","_killerName","_weapon","_distance","_message","_loc_message","_key","_death_record"];
//[unit, weapon, muzzle, mode, ammo, magazine, projectile] //[unit, weapon, muzzle, mode, ammo, magazine, projectile]
_characterID = _this select 0; _characterID = _this select 0;
_minutes = _this select 1; _minutes = _this select 1;
@@ -8,9 +8,8 @@ _playerName = toString(_this select 4);
_infected = _this select 5; _infected = _this select 5;
_victim = _newObject; _victim = _newObject;
_victimArray = toArray "nil"; _victimName = _victim getVariable["bodyName", "nil"];
_victimNameArray = _victim getVariable["bodyName", _victimArray];
_victimName = toString (_victimNameArray);
_killer = _victim getVariable["AttackedBy", "nil"]; _killer = _victim getVariable["AttackedBy", "nil"];
_killerName = _victim getVariable["AttackedByName", "nil"]; _killerName = _victim getVariable["AttackedByName", "nil"];