Skip to content

fix: build #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nefertumm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: build #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49af777
fix: build
Nefertumm Apr 28, 2023
9e5d4b6
Update CFBG.cpp
Nefertumm Apr 28, 2023
a39537b
Update CFBG.cpp
Nefertumm Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/CFBG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ void CFBG::ValidatePlayerForBG(Battleground* bg, Player* player)

TeamId teamId{ player->GetBgTeamId() };

if (player->GetTeamId(true) == teamId)
if (player->GetTeamId() == teamId)
return;

BGData& bgdata = player->GetBGData();
Expand Down Expand Up @@ -432,15 +432,15 @@ CFBG::RandomSkinInfo CFBG::GetRandomRaceMorph(TeamId team, uint8 playerClass, ui

void CFBG::SetFakeRaceAndMorph(Player* player)
{
if (!player->InBattleground() || player->GetTeamId(true) == player->GetBgTeamId() || IsPlayerFake(player))
if (!player->InBattleground() || player->GetTeamId() == player->GetBgTeamId() || IsPlayerFake(player))
return;

// generate random race and morph
RandomSkinInfo skinInfo{ GetRandomRaceMorph(player->GetTeamId(true), player->getClass(), player->getGender()) };
RandomSkinInfo skinInfo{ GetRandomRaceMorph(player->GetTeamId(), player->getClass(), player->getGender()) };

uint8 selectedRace = player->GetPlayerSetting("mod-cfbg", SETTING_CFBG_RACE).value;

if (!RandomizeRaces() && selectedRace && IsRaceValidForFaction(player->GetTeamId(true), selectedRace))
if (!RandomizeRaces() && selectedRace && IsRaceValidForFaction(player->GetTeamId(), selectedRace))
{
skinInfo.first = selectedRace;
skinInfo.second = GetMorphFromRace(skinInfo.first, player->getGender());
Expand All @@ -451,7 +451,7 @@ void CFBG::SetFakeRaceAndMorph(Player* player)
skinInfo.first,
skinInfo.second,
player->TeamIdForRace(skinInfo.first),
player->getRace(true),
player->getRace(),
player->GetDisplayId(),
player->GetNativeDisplayId(),
player->GetTeamId(true)
Expand Down Expand Up @@ -586,7 +586,7 @@ bool CFBG::SendRealNameQuery(Player* player)
data << uint8(0); // added in 3.1; if > 1, then end of packet
data << player->GetName(); // played name
data << uint8(0); // realm name for cross realm BG usage
data << uint8(player->getRace(true));
data << uint8(player->getRace());
data << uint8(player->getGender());
data << uint8(player->getClass());
data << uint8(0); // is not declined
Expand All @@ -597,7 +597,7 @@ bool CFBG::SendRealNameQuery(Player* player)

bool CFBG::IsPlayingNative(Player* player)
{
return player->GetTeamId(true) == player->GetBGData().bgTeamId;
return player->GetTeamId() == player->GetBGData().bgTeamId;
}

bool CFBG::CheckCrossFactionMatch(BattlegroundQueue* queue, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers)
Expand Down
4 changes: 2 additions & 2 deletions src/CFBG_SC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class CFBG_Player : public PlayerScript
return;
}

if (player->GetTeamId(true) != player->GetBgTeamId())
if (player->GetTeamId() != player->GetBgTeamId())
{
sCFBG->FitPlayerInTeam(player, player->GetBattleground() && !player->GetBattleground()->isArena(), player->GetBattleground());
}
Expand Down Expand Up @@ -179,7 +179,7 @@ class CFBG_Player : public PlayerScript
bool OnReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
{
uint32 repGain = player->GetReputation(factionID);
TeamId teamId = player->GetTeamId(true);
TeamId teamId = player->GetTeamId();

if ((factionID == FACTION_FROSTWOLF_CLAN && teamId == TEAM_ALLIANCE) ||
(factionID == FACTION_STORMPIKE_GUARD && teamId == TEAM_HORDE))
Expand Down