From 963ab3058173fcb04a3f7c5791677f7d7fcedd0a Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Wed, 30 Aug 2017 04:02:25 -0500 Subject: [PATCH] No temp group invite if in main group --- .../scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf b/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf index 071f6427..2a3cf0b0 100644 --- a/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf +++ b/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf @@ -27,13 +27,21 @@ Epoch_my_tempGroup params [ ["_memberArray",[]] ]; +Epoch_my_Group params [ + ["_groupName2",""], + ["_leaderName2",""], + ["_groupSize2",0], + ["_modArray2",[]], + ["_memberArray2",[]] +]; + if (_playerUID == Epoch_my_tempGroupUID || {_x select 0 == _playerUID}count (_modArray) > 0) then { _currentMember = count(_modArray) + count(_memberArray) + 1; if (_currentMember < _groupSize) then { _InvitePlayerCombo = (findDisplay -1300) displayCtrl 41; _playerUID = _InvitePlayerCombo lbData (lbCurSel _InvitePlayerCombo); _playerName = _InvitePlayerCombo lbText (lbCurSel _InvitePlayerCombo); - if (_playerUID != "" && _playerName != "" && ({_playerUID in _x} count (_modArray) == 0) && ({_playerUID in _x} count (_memberArray) == 0) && !(_playerUID == Epoch_my_tempGroupUID)) then { + if (_playerUID != "" && _playerName != "" && ({_playerUID in _x} count (_modArray) == 0) && ({_playerUID in _x} count (_memberArray) == 0) && ({_playerUID in _x} count (_modArray2) == 0) && ({_playerUID in _x} count (_memberArray2) == 0) && !(_playerUID == Epoch_my_tempGroupUID)) then { _txt = format["Do you want to add %1 to your Temp Group?",_playerName]; [_playerUID,_txt,_groupName] spawn { params ["_playerUID","_txt","_groupName"];