josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Get rid of dirty operator workaround for ACE_Singleton class implementation

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-22 21:25:23 +01:00
parent 0948fc5bbe
commit 0f3b9019a8
159 changed files with 1943 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/ArenaTeam.cpp
+14 -14
View File
@@ -66,9 +66,9 @@ ArenaTeam::~ArenaTeam()
bool ArenaTeam::Create(uint64 captainGuid, uint32 type, std::string ArenaTeamName)
{
if (!sObjectMgr.GetPlayer(captainGuid)) // player not exist
if (!sObjectMgr->GetPlayer(captainGuid)) // player not exist
return false;
if (sObjectMgr.GetArenaTeamByName(ArenaTeamName)) // arena team with this name already exist
if (sObjectMgr->GetArenaTeamByName(ArenaTeamName)) // arena team with this name already exist
return false;
uint32 captainLowGuid = GUID_LOPART(captainGuid);
@@ -78,7 +78,7 @@ bool ArenaTeam::Create(uint64 captainGuid, uint32 type, std::string ArenaTeamNam
m_Name = ArenaTeamName;
m_Type = type;
m_TeamId = sObjectMgr.GenerateArenaTeamId();
m_TeamId = sObjectMgr->GenerateArenaTeamId();
// ArenaTeamName already assigned to ArenaTeam::name, use it to encode string for DB
CharacterDatabase.escape_string(ArenaTeamName);
@@ -110,7 +110,7 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
if (GetMembersSize() >= GetType() * 2)
return false;
Player *pl = sObjectMgr.GetPlayer(PlayerGuid);
Player *pl = sObjectMgr->GetPlayer(PlayerGuid);
if (pl)
{
if (pl->GetArenaTeamId(GetSlot()))
@@ -291,7 +291,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult arenaTeamMembersResult)
void ArenaTeam::SetCaptain(const uint64& guid)
{
// disable remove/promote buttons
Player *oldcaptain = sObjectMgr.GetPlayer(GetCaptain());
Player *oldcaptain = sObjectMgr->GetPlayer(GetCaptain());
if (oldcaptain)
oldcaptain->SetArenaTeamInfoField(GetSlot(), ARENA_TEAM_MEMBER, 1);
@@ -302,7 +302,7 @@ void ArenaTeam::SetCaptain(const uint64& guid)
CharacterDatabase.PExecute("UPDATE arena_team SET captainguid = '%u' WHERE arenateamid = '%u'", GUID_LOPART(guid), GetId());
// enable remove/promote buttons
Player *newcaptain = sObjectMgr.GetPlayer(guid);
Player *newcaptain = sObjectMgr->GetPlayer(guid);
if (newcaptain)
{
newcaptain->SetArenaTeamInfoField(GetSlot(), ARENA_TEAM_MEMBER, 0);
@@ -319,7 +319,7 @@ void ArenaTeam::DelMember(uint64 guid)
break;
}
if (Player *player = sObjectMgr.GetPlayer(guid))
if (Player *player = sObjectMgr->GetPlayer(guid))
{
player->GetSession()->SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, GetName(), "", 0);
// delete all info regarding this team
@@ -350,7 +350,7 @@ void ArenaTeam::Disband(WorldSession *session)
trans->PAppend("DELETE FROM arena_team_member WHERE arenateamid = '%u'", m_TeamId); //< this should be alredy done by calling DelMember(memberGuids[j]); for each member
trans->PAppend("DELETE FROM arena_team_stats WHERE arenateamid = '%u'", m_TeamId);
CharacterDatabase.CommitTransaction(trans);
sObjectMgr.RemoveArenaTeam(m_TeamId);
sObjectMgr->RemoveArenaTeam(m_TeamId);
}
void ArenaTeam::Roster(WorldSession *session)
@@ -367,7 +367,7 @@ void ArenaTeam::Roster(WorldSession *session)
for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
pl = sObjectMgr.GetPlayer(itr->guid);
pl = sObjectMgr->GetPlayer(itr->guid);
data << uint64(itr->guid); // guid
data << uint8((pl ? 1 : 0)); // online flag
@@ -425,7 +425,7 @@ void ArenaTeam::NotifyStatsChanged()
// updates arena team stats for every member of the team (not only the ones who participated!)
for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
Player * plr = sObjectMgr.GetPlayer(itr->guid);
Player * plr = sObjectMgr->GetPlayer(itr->guid);
if (plr)
Stats(plr->GetSession());
}
@@ -498,7 +498,7 @@ void ArenaTeam::BroadcastPacket(WorldPacket *packet)
{
for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
Player *player = sObjectMgr.GetPlayer(itr->guid);
Player *player = sObjectMgr->GetPlayer(itr->guid);
if (player)
player->GetSession()->SendPacket(packet);
}
@@ -677,8 +677,8 @@ void ArenaTeam::FinishGame(int32 mod)
m_stats.games_season += 1;
// update team's rank
m_stats.rank = 1;
ObjectMgr::ArenaTeamMap::const_iterator i = sObjectMgr.GetArenaTeamMapBegin();
for (; i != sObjectMgr.GetArenaTeamMapEnd(); ++i)
ObjectMgr::ArenaTeamMap::const_iterator i = sObjectMgr->GetArenaTeamMapBegin();
for (; i != sObjectMgr->GetArenaTeamMapEnd(); ++i)
{
if (i->second->GetType() == m_Type && i->second->GetStats().rating > m_stats.rating)
++m_stats.rank;
@@ -847,7 +847,7 @@ void ArenaTeam::FinishWeek()
bool ArenaTeam::IsFighting() const
{
for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
if (Player *p = sObjectMgr.GetPlayer(itr->guid))
if (Player *p = sObjectMgr->GetPlayer(itr->guid))
if (p->GetMap()->IsBattleArena())
return true;
return false;