araxiaonline/TrinityCore2
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore2.git synced 2026-06-18 22:09:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Battlegrounds: Refactoring some pointless parameters

Browse Source
This commit is contained in:
leak
2011-02-09 16:47:12 +01:00
parent 4a55030f38
commit 422cfec07d
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Battleground.cpp
+14 -13
View File
@@ -1188,52 +1188,53 @@ void Battleground::AddPlayer(Player *plr)
// setup BG group membership
PlayerAddedToBGCheckIfBGIsRunning(plr);
AddOrSetPlayerToCorrectBgGroup(plr, guid, team);
AddOrSetPlayerToCorrectBgGroup(plr, team);
// Log
sLog->outDetail("BATTLEGROUND: Player %s joined the battle.", plr->GetName());
}
/* this method adds player to his team's bg group, or sets his correct group if player is already in bg group */
void Battleground::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid, uint32 team)
void Battleground::AddOrSetPlayerToCorrectBgGroup(Player *player, uint32 team)
{
uint64 playerGuid = player->GetGUID();
Group* group = GetBgRaid(team);
if (!group) // first player joined
{
group = new Group;
SetBgRaid(team, group);
group->Create(plr_guid, plr->GetName());
group->Create(playerGuid, player->GetName());
}
else // raid already exist
{
if (group->IsMember(plr_guid))
if (group->IsMember(playerGuid))
{
uint8 subgroup = group->GetMemberGroup(plr_guid);
plr->SetBattlegroundRaid(group, subgroup);
uint8 subgroup = group->GetMemberGroup(playerGuid);
player->SetBattlegroundRaid(group, subgroup);
}
else
{
group->AddMember(plr_guid, plr->GetName());
if (Group* originalGroup = plr->GetOriginalGroup())
if (originalGroup->IsLeader(plr_guid))
group->ChangeLeader(plr_guid);
group->AddMember(playerGuid, player->GetName());
if (Group* originalGroup = player->GetOriginalGroup())
if (originalGroup->IsLeader(playerGuid))
group->ChangeLeader(playerGuid);
}
}
}
// This method should be called when player logs into running battleground
void Battleground::EventPlayerLoggedIn(Player* player, uint64 plr_guid)
void Battleground::EventPlayerLoggedIn(Player* player)
{
// player is correct pointer
for (std::deque<uint64>::iterator itr = m_OfflineQueue.begin(); itr != m_OfflineQueue.end(); ++itr)
{
if (*itr == plr_guid)
if (*itr == player->GetGUID())
{
m_OfflineQueue.erase(itr);
break;
}
}
m_Players[plr_guid].OfflineRemoveTime = 0;
m_Players[player->GetGUID()].OfflineRemoveTime = 0;
PlayerAddedToBGCheckIfBGIsRunning(player);
// if battleground is starting, then add preparation aura
// we don't have to do that, because preparation aura isn't removed when player logs out
src/server/game/Battlegrounds/Battleground.h
+2 -2
View File
@@ -530,7 +530,7 @@ class Battleground
virtual void EventPlayerDroppedFlag(Player* /*player*/) {}
virtual void EventPlayerClickedOnFlag(Player* /*player*/, GameObject* /*target_obj*/) {}
virtual void EventPlayerCapturedFlag(Player* /*player*/) {}
void EventPlayerLoggedIn(Player* player, uint64 plr_guid);
void EventPlayerLoggedIn(Player* player);
void EventPlayerLoggedOut(Player* player);
virtual void EventPlayerDamagedGO(Player* /*plr*/, GameObject* /*go*/, uint8 /*hitType*/, uint32 /*destroyedEvent*/) {}
virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){}
@@ -545,7 +545,7 @@ class Battleground
virtual void AddPlayer(Player *plr); // must be implemented in BG subclass
void AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid, uint32 team);
void AddOrSetPlayerToCorrectBgGroup(Player *player, uint32 team);
virtual void RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPacket);
// can be extended in in BG subclass
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -16357,8 +16357,8 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
m_bgData.bgTypeID = currentBg->GetTypeID(true);
//join player to battleground group
currentBg->EventPlayerLoggedIn(this, GetGUID());
currentBg->AddOrSetPlayerToCorrectBgGroup(this, GetGUID(), m_bgData.bgTeam);
currentBg->EventPlayerLoggedIn(this);
currentBg->AddOrSetPlayerToCorrectBgGroup(this, m_bgData.bgTeam);
SetInviteForBattlegroundQueueType(bgQueueTypeId,currentBg->GetInstanceID());
}
@@ -24555,4 +24555,4 @@ void Player::SendClearFocus(Unit* target)
WorldPacket data(SMSG_BREAK_TARGET, target->GetPackGUID().size());
data.append(target->GetPackGUID());
GetSession()->SendPacket(&data);
}
}