W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rejoin group after change clothes

Browse Source 
Also removed redundant delete and remove for _oldUnit since it is
already done in call _switchUnit
This commit is contained in:
ebaydayz
2016-11-05 17:48:07 -04:00
parent d97478239c
commit 615f21165a
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ _switchUnit = {
removeAllWeapons _oldUnit; removeAllWeapons _oldUnit;
{_oldUnit removeMagazine _x;} count magazines _oldUnit; {_oldUnit removeMagazine _x;} count magazines _oldUnit;
if !(isNull _oldUnit) then {deleteVehicle _oldUnit;}; if !(isNull _oldUnit) then {deleteVehicle _oldUnit;};
if (!isNil "dayz_groupInit" && count (units _oldGroup) > 1) then { if (!isNil "dayz_groupInit" && count (units _oldGroup) > 0) then {
[_newUnit] joinSilent _oldGroup; [_newUnit] joinSilent _oldGroup;
if (count (units _group) == 0) then {deleteGroup _group;}; if (count (units _group) == 0) then {deleteGroup _group;};
if (_leader) then { if (_leader) then {
@@ -190,12 +190,6 @@ if (gear_done) then {disableUserInput false;disableUserInput false;disableUserIn
//diag_log format["Backpack weapons: %1",getWeaponCargo unitBackpack _newUnit]; //diag_log format["Backpack weapons: %1",getWeaponCargo unitBackpack _newUnit];
//diag_log format["Backpack magazines: %1",getMagazineCargo unitBackpack _newUnit]; //diag_log format["Backpack magazines: %1",getMagazineCargo unitBackpack _newUnit];
//Clear and delete old Unit
removeAllWeapons _oldUnit;
{_oldUnit removeMagazine _x;} count magazines _oldUnit;
if !(isNull _oldUnit) then {deleteVehicle _oldUnit;};
deleteGroup _oldGroup;
// player switchCamera = _currentCamera; // player switchCamera = _currentCamera;
if (_currentWpn != "") then {_newUnit selectWeapon _currentWpn;}; if (_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
[objNull, player, rSwitchMove, _currentAnim] call RE; [objNull, player, rSwitchMove, _currentAnim] call RE;