diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2023-12-29 14:12:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 14:12:15 +0100 |
| commit | 1ef0c045202a6af33fb991f2ff765fa183ce976f (patch) | |
| tree | 4a2744ed72b4e66935341c4d1ee3b01e5d80f0e1 /src/server/game/Battlegrounds/Arena.cpp | |
| parent | fb64d7fe8efe5ecba40123cdc96195d3ca52d7c0 (diff) | |
Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types (#29535)
* Fix criteria data type bg loss team score
Diffstat (limited to 'src/server/game/Battlegrounds/Arena.cpp')
| -rw-r--r-- | src/server/game/Battlegrounds/Arena.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp index 6ec0f0f8c1e..422dd9fbe1b 100644 --- a/src/server/game/Battlegrounds/Arena.cpp +++ b/src/server/game/Battlegrounds/Arena.cpp @@ -114,7 +114,7 @@ void Arena::RemovePlayerAtLeave(ObjectGuid guid, bool transport, bool sendPacket if (itr != m_Players.end()) // check if the player was a participant of the match, or only entered through gm command (appear) { // if the player was a match participant, calculate rating - uint32 team = itr->second.Team; + Team team = itr->second.Team; ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(team))); ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(team)); @@ -142,7 +142,7 @@ void Arena::CheckWinConditions() EndBattleground(ALLIANCE); } -void Arena::EndBattleground(uint32 winner) +void Arena::EndBattleground(Team winner) { // arena rating calculation if (isRated()) @@ -159,17 +159,17 @@ void Arena::EndBattleground(uint32 winner) // In case of arena draw, follow this logic: // winnerArenaTeam => ALLIANCE, loserArenaTeam => HORDE - ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(winner == 0 ? uint32(ALLIANCE) : winner)); - ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(winner == 0 ? uint32(HORDE) : GetOtherTeam(winner))); + ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(winner == TEAM_OTHER ? ALLIANCE : winner)); + ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(winner == TEAM_OTHER ? HORDE : GetOtherTeam(winner))); if (winnerArenaTeam && loserArenaTeam && winnerArenaTeam != loserArenaTeam) { // In case of arena draw, follow this logic: // winnerMatchmakerRating => ALLIANCE, loserMatchmakerRating => HORDE loserTeamRating = loserArenaTeam->GetRating(); - loserMatchmakerRating = GetArenaMatchmakerRating(winner == 0 ? uint32(HORDE) : GetOtherTeam(winner)); + loserMatchmakerRating = GetArenaMatchmakerRating(winner == TEAM_OTHER ? HORDE : GetOtherTeam(winner)); winnerTeamRating = winnerArenaTeam->GetRating(); - winnerMatchmakerRating = GetArenaMatchmakerRating(winner == 0 ? uint32(ALLIANCE) : winner); + winnerMatchmakerRating = GetArenaMatchmakerRating(winner == TEAM_OTHER ? ALLIANCE : winner); if (winner != 0) { @@ -217,7 +217,7 @@ void Arena::EndBattleground(uint32 winner) for (auto const& i : GetPlayers()) { - uint32 team = i.second.Team; + Team team = i.second.Team; if (i.second.OfflineRemoveTime) { |