nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 22:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-01 12:56:06 -06:00
committed by GitHub
parent cd7a22a4de 753d531f22
commit 399b8803b8
6 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/shared/SharedDefines.h
View File

@@ -3418,12 +3418,32 @@ uint8 constexpr PVP_TEAMS_COUNT = 2;
inline PvPTeamId GetPvPTeamId(TeamId teamId)
{
return teamId == TEAM_ALLIANCE ? PVP_TEAM_ALLIANCE : PVP_TEAM_HORDE;
if (teamId == TEAM_ALLIANCE)
{
return PVP_TEAM_ALLIANCE;
}
if (teamId == TEAM_HORDE)
{
return PVP_TEAM_HORDE;
}
return PVP_TEAM_NEUTRAL;
}
inline TeamId GetTeamId(PvPTeamId teamId)
{
return teamId == PVP_TEAM_ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE;
if (teamId == PVP_TEAM_ALLIANCE)
{
return TEAM_ALLIANCE;
}
if (teamId == PVP_TEAM_HORDE)
{
return TEAM_HORDE;
}
return TEAM_NEUTRAL;
}
// indexes of BattlemasterList.dbc