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

Only run group tags loop when in a group

Browse Source
This commit is contained in:
ebayShopper
2017-02-13 14:27:40 -05:00
parent e8dd8fac63
commit 6e846847de
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ _myGroup = group _body;
[_body] joinSilent dayz_firstGroup; [_body] joinSilent dayz_firstGroup;
deleteGroup _myGroup; deleteGroup _myGroup;
80000 cutText ["","PLAIN"]; //Clear group icons 80000 cutText ["","PLAIN"]; //Clear group tags
3 cutRsc ["default", "PLAIN",3]; 3 cutRsc ["default", "PLAIN",3];
4 cutRsc ["default", "PLAIN",3]; 4 cutRsc ["default", "PLAIN",3];

3
SQF/dayz_code/groups/disband.sqf
View File

@@ -13,4 +13,7 @@ dayz_groupDisbandThread = _group spawn {
{[_x] joinSilent grpNull} count (units _this); {[_x] joinSilent grpNull} count (units _this);
deleteGroup _this; deleteGroup _this;
terminate dayz_groupTags;
80000 cutText ["","PLAIN"];
}; };

2
SQF/dayz_code/groups/groupTags.sqf
View File

@@ -3,7 +3,7 @@ private ["_display","_distance","_group","_icon","_index","_pos","_scale","_scre
while {true} do { while {true} do {
_group = player call dayz_filterGroup; _group = player call dayz_filterGroup;
if (!visibleMap && count _group > 1 && cameraView in ["INTERNAL","EXTERNAL","GUNNER"]) then { if (!visibleMap && count _group > 1) then { //Use (&& cameraView != "GROUP") if tactical view is allowed (blocked by default)
80000 cutRsc ["DZ_GroupTags","PLAIN"]; 80000 cutRsc ["DZ_GroupTags","PLAIN"];
_display = uiNamespace getVariable "DZ_GroupTags"; _display = uiNamespace getVariable "DZ_GroupTags";

4
SQF/dayz_code/groups/init.sqf
View File

@@ -41,7 +41,9 @@ dayz_promotePlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\grou
dayz_rejectGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\reject.sqf"; dayz_rejectGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\reject.sqf";
dayz_groupInit = true; dayz_groupInit = true;
execVM "\z\addons\dayz_code\groups\groupTags.sqf"; if (count (units group player) > 1) then {
dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
};
if (dayz_requireRadio or {dayz_markGroup > 0} or {dayz_markSelf > 0} or {dayz_markBody > 0}) then { if (dayz_requireRadio or {dayz_markGroup > 0} or {dayz_markSelf > 0} or {dayz_markBody > 0}) then {
execVM "\z\addons\dayz_code\groups\groupMarkers.sqf"; execVM "\z\addons\dayz_code\groups\groupMarkers.sqf";

4
SQF/dayz_code/groups/join.sqf
View File

@@ -28,6 +28,10 @@ if (!isNull _inviter) then {
[player] joinSilent (group _inviter); [player] joinSilent (group _inviter);
if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;}; if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;};
if (isNil "dayz_groupTags" or {scriptDone "dayz_groupTags"}) then {
dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
};
// Update saved group in DB // Update saved group in DB
PVDZ_Server_UpdateGroup = [1,player]; PVDZ_Server_UpdateGroup = [1,player];
publicVariableServer "PVDZ_Server_UpdateGroup"; publicVariableServer "PVDZ_Server_UpdateGroup";

3
SQF/dayz_code/groups/leave.sqf
View File

@@ -11,4 +11,7 @@ dayz_groupLeaveThread = [] spawn {
//Wait for response from server to confirm group finished updating in DB //Wait for response from server to confirm group finished updating in DB
waitUntil {!isNil "dayz_groupLeft"}; waitUntil {!isNil "dayz_groupLeft"};
[player] joinSilent grpNull; [player] joinSilent grpNull;
terminate dayz_groupTags;
80000 cutText ["","PLAIN"];
}; };