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

* Some singleton renames for consistency:

Browse Source 
accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-08-08 05:25:45 +02:00
parent 93fc24ece9
commit 9083271a2f
97 changed files with 1354 additions and 1353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Channels/Channel.cpp
+21 -21
View File
@@ -156,7 +156,7 @@ void Channel::Join(uint64 p, const char *pass)
return;
}
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (plr)
{
@@ -216,7 +216,7 @@ void Channel::Leave(uint64 p, bool send)
}
else
{
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (send)
{
@@ -252,7 +252,7 @@ void Channel::Leave(uint64 p, bool send)
void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
{
AccountTypes sec = SEC_PLAYER;
Player *gplr = objmgr.GetPlayer(good);
Player *gplr = sObjectMgr.GetPlayer(good);
if (gplr)
sec = gplr->GetSession()->GetSecurity();
@@ -270,7 +270,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
}
else
{
Player *bad = objmgr.GetPlayer(badname);
Player *bad = sObjectMgr.GetPlayer(badname);
if (bad == NULL || !IsOn(bad->GetGUID()))
{
WorldPacket data;
@@ -316,7 +316,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
void Channel::UnBan(uint64 good, const char *badname)
{
uint32 sec = 0;
Player *gplr = objmgr.GetPlayer(good);
Player *gplr = sObjectMgr.GetPlayer(good);
if (gplr)
sec = gplr->GetSession()->GetSecurity();
@@ -334,7 +334,7 @@ void Channel::UnBan(uint64 good, const char *badname)
}
else
{
Player *bad = objmgr.GetPlayer(badname);
Player *bad = sObjectMgr.GetPlayer(badname);
if (bad == NULL || !IsBanned(bad->GetGUID()))
{
WorldPacket data;
@@ -358,7 +358,7 @@ void Channel::Password(uint64 p, const char *pass)
{
std::string plName;
uint32 sec = 0;
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (plr)
sec = plr->GetSession()->GetSecurity();
@@ -396,7 +396,7 @@ void Channel::Password(uint64 p, const char *pass)
void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
{
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (!plr)
return;
@@ -416,7 +416,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
}
else
{
Player *newp = objmgr.GetPlayer(p2n);
Player *newp = sObjectMgr.GetPlayer(p2n);
if (!newp)
{
WorldPacket data;
@@ -464,7 +464,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
void Channel::SetOwner(uint64 p, const char *newname)
{
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (!plr)
return;
@@ -486,7 +486,7 @@ void Channel::SetOwner(uint64 p, const char *newname)
return;
}
Player *newp = objmgr.GetPlayer(newname);
Player *newp = sObjectMgr.GetPlayer(newname);
if (newp == NULL || !IsOn(newp->GetGUID()))
{
WorldPacket data;
@@ -548,7 +548,7 @@ void Channel::List(Player* player)
uint32 count = 0;
for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
{
Player *plr = objmgr.GetPlayer(i->first);
Player *plr = sObjectMgr.GetPlayer(i->first);
// PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
// MODERATOR, GAME MASTER, ADMINISTRATOR can see all
@@ -570,7 +570,7 @@ void Channel::List(Player* player)
void Channel::Announce(uint64 p)
{
uint32 sec = 0;
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (plr)
sec = plr->GetSession()->GetSecurity();
@@ -605,7 +605,7 @@ void Channel::Announce(uint64 p)
void Channel::Moderate(uint64 p)
{
uint32 sec = 0;
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (plr)
sec = plr->GetSession()->GetSecurity();
@@ -644,7 +644,7 @@ void Channel::Say(uint64 p, const char *what, uint32 lang)
lang = LANG_UNIVERSAL;
uint32 sec = 0;
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (plr)
sec = plr->GetSession()->GetSecurity();
@@ -695,7 +695,7 @@ void Channel::Invite(uint64 p, const char *newname)
return;
}
Player *newp = objmgr.GetPlayer(newname);
Player *newp = sObjectMgr.GetPlayer(newname);
if (!newp)
{
WorldPacket data;
@@ -712,7 +712,7 @@ void Channel::Invite(uint64 p, const char *newname)
return;
}
Player *plr = objmgr.GetPlayer(p);
Player *plr = sObjectMgr.GetPlayer(p);
if (!plr)
return;
@@ -779,7 +779,7 @@ void Channel::SendToAll(WorldPacket *data, uint64 p)
{
for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
{
Player *plr = objmgr.GetPlayer(i->first);
Player *plr = sObjectMgr.GetPlayer(i->first);
if (plr)
{
if (!p || !plr->GetSocial()->HasIgnore(GUID_LOPART(p)))
@@ -794,7 +794,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
{
if (i->first != who)
{
Player *plr = objmgr.GetPlayer(i->first);
Player *plr = sObjectMgr.GetPlayer(i->first);
if (plr)
plr->GetSession()->SendPacket(data);
}
@@ -803,7 +803,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
void Channel::SendToOne(WorldPacket *data, uint64 who)
{
Player *plr = objmgr.GetPlayer(who);
Player *plr = sObjectMgr.GetPlayer(who);
if (plr)
plr->GetSession()->SendPacket(data);
}
@@ -907,7 +907,7 @@ void Channel::MakeChannelOwner(WorldPacket *data)
{
std::string name = "";
if (!objmgr.GetPlayerNameByGUID(m_ownerGUID, name) || name.empty())
if (!sObjectMgr.GetPlayerNameByGUID(m_ownerGUID, name) || name.empty())
name = "PLAYER_NOT_FOUND";
MakeNotifyPacket(data, CHAT_CHANNEL_OWNER_NOTICE);