From 7e73057151af21313cf91d556a036944d8b7af17 Mon Sep 17 00:00:00 2001 From: M'Dic Date: Mon, 16 Oct 2023 10:18:16 -0400 Subject: [PATCH] update (module): core aligntment --- src/server/game/DungeonFinding/LFGQueue.cpp | 6 +++--- src/server/game/Groups/Group.cpp | 2 +- src/server/game/Groups/Group.h | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index a46d1833b2..c9274a6d84 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -421,8 +421,8 @@ LfgCompatibility LFGQueue::CheckCompatibility(GuidList check) } } - // Group with less that MAXGROUPSIZE members always compatible - if (!sLFGMgr->IsSoloLFG() && numPlayers != MAXGROUPSIZE) //solo lfg + // Group with less that MAX_GROUP_SIZE members always compatible + if (!sLFGMgr->IsSoloLFG() && numPlayers != MAX_GROUP_SIZE) //solo lfg { TC_LOG_DEBUG("lfg.queue.match.compatibility.check", "Guids: ({}) single group. Compatibles", GetDetailedMatchRoles(check)); LfgQueueDataContainer::iterator itQueue = QueueDataStore.find(check.front()); @@ -520,7 +520,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(GuidList check) } // Enough players? - if (!sLFGMgr->IsSoloLFG() && numPlayers != MAXGROUPSIZE) //solo lfg + if (!sLFGMgr->IsSoloLFG() && numPlayers != MAX_GROUP_SIZE) //solo lfg { TC_LOG_DEBUG("lfg.queue.match.compatibility.check", "Guids: ({}) Compatibles but not enough players({})", GetDetailedMatchRoles(check), numPlayers); LfgCompatibilityData data(LFG_COMPATIBLES_WITH_LESS_PLAYERS); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 4fa1ce16d7..693b400225 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1972,7 +1972,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* // check for min / max count uint32 memberscount = GetMembersCount(); - if (memberscount > bgEntry->MaxGroupSize) // no MinPlayerCount for battlegrounds + if (memberscount > bgEntry->MAX_GROUP_SIZE) // no MinPlayerCount for battlegrounds return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.) diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 7793e09297..1f41825107 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -39,11 +39,10 @@ class WorldSession; struct MapEntry; -#define MAX_GROUP_SIZE 5 -#define MAX_RAID_SIZE 40 -#define MAX_RAID_SUBGROUPS MAX_RAID_SIZE / MAX_GROUP_SIZE - -#define TARGET_ICONS_COUNT 8 +#define MAX_GROUP_SIZE 5 +#define MAX_RAID_SIZE 40 +#define MAX_RAID_SUBGROUPS MAX_RAID_SIZE/MAX_GROUP_SIZE +#define TARGET_ICONS_COUNT 8 enum RollVote {