From dbb9e97efce747feb947c6b84ac535c114137036 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 28 Oct 2016 20:10:10 -0400 Subject: [PATCH] Update group dialog --- SQF/dayz_code/groups/kickFromGroup.sqf | 4 +++- SQF/dayz_code/groups/openDialog.sqf | 2 +- SQF/dayz_code/groups/promotePlayer.sqf | 10 +++------- SQF/dayz_code/init/variables.sqf | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/SQF/dayz_code/groups/kickFromGroup.sqf b/SQF/dayz_code/groups/kickFromGroup.sqf index 2dc241126..09514a027 100644 --- a/SQF/dayz_code/groups/kickFromGroup.sqf +++ b/SQF/dayz_code/groups/kickFromGroup.sqf @@ -12,4 +12,6 @@ if (isNull _target or _target == player or player != leader group player) exitWi [_target] join grpNull; PVDZ_Server_UpdateGroup = [2,player,_targetUID]; -publicVariableServer "PVDZ_Server_UpdateGroup"; \ No newline at end of file +publicVariableServer "PVDZ_Server_UpdateGroup"; + +_myGroup call dayz_selectGroupMember; //update lbCurSel change \ No newline at end of file diff --git a/SQF/dayz_code/groups/openDialog.sqf b/SQF/dayz_code/groups/openDialog.sqf index 633c38990..b1942bc95 100644 --- a/SQF/dayz_code/groups/openDialog.sqf +++ b/SQF/dayz_code/groups/openDialog.sqf @@ -35,7 +35,7 @@ while {!isNull findDisplay 80000} do { _leaveButton ctrlShow true; if (player == _leader) then {_disbandButton ctrlShow true}; } else { - {_x ctrlShow false} count [_disbandButton,_leaveButton]; + {_x ctrlShow false} count [_disbandButton,_leaveButton,_kickButton,_promoteButton]; }; _hasInvite = false; diff --git a/SQF/dayz_code/groups/promotePlayer.sqf b/SQF/dayz_code/groups/promotePlayer.sqf index 59e41eeca..5f2a64f17 100644 --- a/SQF/dayz_code/groups/promotePlayer.sqf +++ b/SQF/dayz_code/groups/promotePlayer.sqf @@ -11,13 +11,9 @@ _group = group player; _target = _uid call dayz_getPlayer; if (player == leader _group && {!isNull _target} && {_target != player}) then { - if (local _group) then { - _group selectLeader _target; //group must be local - _promoteButton ctrlShow false; - _disbandButton ctrlShow false; - } else { - systemChat "Failed: Group must be local to do this"; - }; + _group selectLeader _target; + _promoteButton ctrlShow false; + _disbandButton ctrlShow false; } else { _promoteButton ctrlShow false; }; \ No newline at end of file diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 7cabe0af4..a2c6959df 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -710,5 +710,5 @@ if (!isDedicated) then { DZE_Quarantine = false; DZE_InRadiationZone = false; DZE_myVehicle = objNull; - dayz_groupNameTags = false; + dayz_groupNameTags = true; };