From e3bb7e11b91e43566a40433921a62c35764c3a50 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Tue, 8 Nov 2016 17:11:39 -0500 Subject: [PATCH] Remove unneeded global var dayz_myGroup --- SQF/dayz_code/groups/init.sqf | 7 ++++--- SQF/dayz_code/system/player_monitor.fsm | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf index c109028e5..92af81e6b 100644 --- a/SQF/dayz_code/groups/init.sqf +++ b/SQF/dayz_code/groups/init.sqf @@ -1,15 +1,16 @@ -private ["_leader","_oldGroup"]; +private ["_leader","_oldGroup","_savedGroup"]; uiSleep 1; if (count (units group player) > 1) then { [player] joinSilent grpNull; }; -if (count dayz_myGroup > 1 && {!dayz_requireRadio or {dayz_requireRadio && "ItemRadio" in items player}}) then { +_savedGroup = PVCDZ_plr_Login select 10; +if (count _savedGroup > 1 && {!dayz_requireRadio or {dayz_requireRadio && "ItemRadio" in items player}}) then { { //Only auto join player into group if leader is in their savedGroup _leader = leader _x; - if (getPlayerUID _leader in dayz_myGroup) exitWith { + if (getPlayerUID _leader in _savedGroup) exitWith { _oldGroup = group player; [player] joinSilent _x; if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;}; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 090cb93b1..99b906181 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -486,7 +486,6 @@ class FSM "_isHiveOk = false;" \n "_newPlayer = false;" \n "_isInfected = false;" \n - "dayz_myGroup = [];" \n "_characterCoins = 0;" \n "_globalCoins = 0;" \n "_CoinsSpecial = 0;" \n @@ -495,7 +494,6 @@ class FSM " _isHiveOk = _msg select 7;" \n " _newPlayer = _msg select 8;" \n " _isInfected = _msg select 9;" \n - " dayz_myGroup = _msg select 10;" \n " _characterCoins = _msg select 11;" \n " _globalCoins = _msg select 12;" \n " _CoinsSpecial = _msg select 13;" \n