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/Commands/Level1.cpp
+37 -37
View File
@@ -129,7 +129,7 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args)
uint64 receiver_guid= atol(receiver_str);
// check online security
if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0))
if (HasLowerSecurity(sObjectMgr.GetPlayer(receiver_guid), 0))
return false;
pCreature->MonsterWhisper(text,receiver_guid);
@@ -302,7 +302,7 @@ std::string ChatHandler::PGetParseString(int32 entry, ...)
bool ChatHandler::HandleGMTicketListCommand(const char* /*args*/)
{
SendSysMessage(LANG_COMMAND_TICKETSHOWLIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr)
for (GmTicketList::iterator itr = sObjectMgr.m_GMTicketList.begin(); itr != sObjectMgr.m_GMTicketList.end(); ++itr)
{
if ((*itr)->closed != 0)
continue;
@@ -312,7 +312,7 @@ bool ChatHandler::HandleGMTicketListCommand(const char* /*args*/)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, (*itr)->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(time(NULL) - (*itr)->createtime, true, false)).c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(time(NULL) - (*itr)->timestamp, true, false)).c_str());
if (objmgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -324,9 +324,9 @@ bool ChatHandler::HandleGMTicketListCommand(const char* /*args*/)
bool ChatHandler::HandleGMTicketListOnlineCommand(const char* /*args*/)
{
SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr)
for (GmTicketList::iterator itr = sObjectMgr.m_GMTicketList.begin(); itr != sObjectMgr.m_GMTicketList.end(); ++itr)
{
if ((*itr)->closed != 0 || !objmgr.GetPlayer((*itr)->playerGuid))
if ((*itr)->closed != 0 || !sObjectMgr.GetPlayer((*itr)->playerGuid))
continue;
std::string gmname;
@@ -335,7 +335,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* /*args*/)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, (*itr)->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(time(NULL) - (*itr)->createtime, true, false)).c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(time(NULL) - (*itr)->timestamp, true, false)).c_str());
if (objmgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -347,7 +347,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* /*args*/)
bool ChatHandler::HandleGMTicketListClosedCommand(const char* /*args*/)
{
SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr)
for (GmTicketList::iterator itr = sObjectMgr.m_GMTicketList.begin(); itr != sObjectMgr.m_GMTicketList.end(); ++itr)
{
if ((*itr)->closed == 0)
continue;
@@ -358,7 +358,7 @@ bool ChatHandler::HandleGMTicketListClosedCommand(const char* /*args*/)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, (*itr)->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(time(NULL) - (*itr)->createtime, true, false)).c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(time(NULL) - (*itr)->timestamp, true, false)).c_str());
if (objmgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID((*itr)->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -373,7 +373,7 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args)
return false;
uint64 tguid = atoi(args);
GM_Ticket *ticket = objmgr.GetGMTicket(tguid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(tguid);
if (!ticket || ticket->closed != 0)
{
SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -386,7 +386,7 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(time(NULL) - ticket->createtime, true, false)).c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(time(NULL) - ticket->timestamp, true, false)).c_str());
if (objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -407,14 +407,14 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
std::string name = (char*)args;
normalizePlayerName(name);
Player *plr = objmgr.GetPlayer(name.c_str());
Player *plr = sObjectMgr.GetPlayer(name.c_str());
if (!plr)
{
SendSysMessage(LANG_NO_PLAYERS_FOUND);
return true;
}
GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(plr->GetGUID());
GM_Ticket *ticket = sObjectMgr.GetGMTicketByPlayer(plr->GetGUID());
if (!ticket)
{
SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -427,7 +427,7 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(time(NULL) - ticket->createtime, true, false)).c_str());
ss << PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(time(NULL) - ticket->timestamp, true, false)).c_str());
if (objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -446,7 +446,7 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args)
return false;
uint64 tguid = atoi(args);
GM_Ticket *ticket = objmgr.GetGMTicket(tguid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(tguid);
if (!ticket || ticket->closed != 0)
{
SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -462,8 +462,8 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETCLOSED, m_session->GetPlayer()->GetName());
SendGlobalGMSysMessage(ss.str().c_str());
Player *plr = objmgr.GetPlayer(ticket->playerGuid);
objmgr.RemoveGMTicket(ticket, m_session->GetPlayer()->GetGUID());
Player *plr = sObjectMgr.GetPlayer(ticket->playerGuid);
sObjectMgr.RemoveGMTicket(ticket, m_session->GetPlayer()->GetGUID());
if (!plr || !plr->IsInWorld())
return true;
@@ -492,7 +492,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
return false;
Player *cplr = m_session->GetPlayer();
GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(ticketGuid);
if (!ticket || ticket->closed != 0)
{
@@ -500,9 +500,9 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
return true;
}
uint64 tarGUID = objmgr.GetPlayerGUIDByName(targm.c_str());
uint64 accid = objmgr.GetPlayerAccountIdByGUID(tarGUID);
uint32 gmlevel = accmgr.GetSecurity(accid, realmID);
uint64 tarGUID = sObjectMgr.GetPlayerGUIDByName(targm.c_str());
uint64 accid = sObjectMgr.GetPlayerAccountIdByGUID(tarGUID);
uint32 gmlevel = sAccountMgr.GetSecurity(accid, realmID);
if (!tarGUID || gmlevel == SEC_PLAYER)
{
@@ -517,7 +517,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
}
std::string gmname;
objmgr.GetPlayerNameByGUID(tarGUID, gmname);
sObjectMgr.GetPlayerNameByGUID(tarGUID, gmname);
if (ticket->assignedToGM != 0 && ticket->assignedToGM != cplr->GetGUID())
{
PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->guid, gmname.c_str());
@@ -525,7 +525,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
}
ticket->assignedToGM = tarGUID;
objmgr.AddOrUpdateGMTicket(*ticket);
sObjectMgr.AddOrUpdateGMTicket(*ticket);
std::stringstream ss;
ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
@@ -541,7 +541,7 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
uint64 ticketGuid = atoi(args);
Player *cplr = m_session->GetPlayer();
GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(ticketGuid);
if (!ticket|| ticket->closed != 0)
{
@@ -555,8 +555,8 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
}
std::string gmname;
objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
Player *plr = objmgr.GetPlayer(ticket->assignedToGM);
sObjectMgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
Player *plr = sObjectMgr.GetPlayer(ticket->assignedToGM);
if (plr && plr->IsInWorld() && plr->GetSession()->GetSecurity() > cplr->GetSession()->GetSecurity())
{
SendSysMessage(LANG_COMMAND_TICKETUNASSIGNSECURITY);
@@ -570,7 +570,7 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
ss << PGetParseString(LANG_COMMAND_TICKETLISTUNASSIGNED, cplr->GetName());
SendGlobalGMSysMessage(ss.str().c_str());
ticket->assignedToGM = 0;
objmgr.AddOrUpdateGMTicket(*ticket);
sObjectMgr.AddOrUpdateGMTicket(*ticket);
return true;
}
@@ -587,7 +587,7 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
return false;
Player *cplr = m_session->GetPlayer();
GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(ticketGuid);
if (!ticket || ticket->closed != 0)
{
@@ -601,13 +601,13 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
}
std::string gmname;
objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
sObjectMgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
ticket->comment = comment;
objmgr.AddOrUpdateGMTicket(*ticket);
sObjectMgr.AddOrUpdateGMTicket(*ticket);
std::stringstream ss;
ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
if (objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
if (sObjectMgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname))
{
ss << PGetParseString(LANG_COMMAND_TICKETLISTASSIGNEDTO, gmname.c_str());
}
@@ -621,7 +621,7 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
if (!*args)
return false;
uint64 ticketGuid = atoi(args);
GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(ticketGuid);
if (!ticket)
{
@@ -639,8 +639,8 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
ss << PGetParseString(LANG_COMMAND_TICKETDELETED, m_session->GetPlayer()->GetName());
SendGlobalGMSysMessage(ss.str().c_str());
Player *plr = objmgr.GetPlayer(ticket->playerGuid);
objmgr.RemoveGMTicket(ticket, -1, true);
Player *plr = sObjectMgr.GetPlayer(ticket->playerGuid);
sObjectMgr.RemoveGMTicket(ticket, -1, true);
if (plr && plr->IsInWorld())
{
// Force abandon ticket
@@ -655,7 +655,7 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
bool ChatHandler::HandleGMTicketReloadCommand(const char*)
{
objmgr.LoadGMTickets();
sObjectMgr.LoadGMTickets();
return true;
}
@@ -994,7 +994,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
// if no bind exists, create a solo bind
InstanceGroupBind *gBind = group ? group->GetBoundInstance(target) : NULL; // if no bind exists, create a solo bind
if (!gBind)
if (InstanceSave *save = sInstanceSaveManager.GetInstanceSave(target->GetInstanceId()))
if (InstanceSave *save = sInstanceSaveMgr.GetInstanceSave(target->GetInstanceId()))
_player->BindToInstance(save, !save->CanReset());
}
@@ -2327,7 +2327,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args)
std::ostringstream reply;
GameTeleMap const & teleMap = objmgr.GetGameTeleMap();
GameTeleMap const & teleMap = sObjectMgr.GetGameTeleMap();
for (GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
{
GameTele const* tele = &itr->second;
@@ -2461,7 +2461,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
return false;
}
Player *chr = objmgr.GetPlayer(name.c_str());*/
Player *chr = sObjectMgr.GetPlayer(name.c_str());*/
if (target)
{