diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2023-08-26 14:03:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 14:03:42 +0200 |
| commit | 0ede6c155605da602b3bafaa3a1212d9f924759b (patch) | |
| tree | c30077044c03821c4af7db095f49b1edf71d7a05 /src/server/game/Battlegrounds/BattlegroundQueue.h | |
| parent | 3e7b5f982c3b518a642447f112fc628edd963ce2 (diff) | |
Core/Battlegrounds: Rework queues (#29200)
* No more copies of Battleground classes
* FreesSlotQueues now have as key the MapId instead of queue id
* Random queues can now popup already busy specific battelgrounds (queues are NOT merged)
* Removed Holiday handling, this should already be handled in BattlegroundMgr::IsBGWeekend
Diffstat (limited to 'src/server/game/Battlegrounds/BattlegroundQueue.h')
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundQueue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 6d1c77999d9..02eb1da9f60 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -77,7 +77,7 @@ class TC_GAME_API BattlegroundQueue void FillPlayersToBG(Battleground* bg, BattlegroundBracketId bracket_id); bool CheckPremadeMatch(BattlegroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam); - bool CheckNormalMatch(Battleground* bg_template, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers); + bool CheckNormalMatch(BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers); bool CheckSkirmishForSameFaction(BattlegroundBracketId bracket_id, uint32 minPlayersPerTeam); GroupQueueInfo* AddGroup(Player const* leader, Group const* group, Team team, PVPDifficultyEntry const* bracketEntry, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 ArenaTeamId = 0); void RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount); @@ -143,8 +143,8 @@ class TC_GAME_API BattlegroundQueue class TC_GAME_API BGQueueInviteEvent : public BasicEvent { public: - BGQueueInviteEvent(ObjectGuid pl_guid, uint32 BgInstanceGUID, BattlegroundTypeId BgTypeId, uint8 arenaType, uint32 removeTime) : - m_PlayerGuid(pl_guid), m_BgInstanceGUID(BgInstanceGUID), m_BgTypeId(BgTypeId), m_ArenaType(arenaType), m_RemoveTime(removeTime) + BGQueueInviteEvent(ObjectGuid pl_guid, uint32 BgInstanceGUID, BattlegroundTypeId BgTypeId, uint32 removeTime, BattlegroundQueueTypeId queueId) : + m_PlayerGuid(pl_guid), m_BgInstanceGUID(BgInstanceGUID), m_BgTypeId(BgTypeId), m_RemoveTime(removeTime), m_QueueId(queueId) { } virtual ~BGQueueInviteEvent() { } @@ -154,8 +154,8 @@ class TC_GAME_API BGQueueInviteEvent : public BasicEvent ObjectGuid m_PlayerGuid; uint32 m_BgInstanceGUID; BattlegroundTypeId m_BgTypeId; - uint8 m_ArenaType; uint32 m_RemoveTime; + BattlegroundQueueTypeId m_QueueId; }; /* |