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/Debugcmds.cpp
+2 -2
View File
@@ -777,7 +777,7 @@ bool ChatHandler::HandleDebugSpawnVehicle(const char* args)
uint32 id = (uint32)atoi(i);
CreatureInfo const *ci = objmgr.GetCreatureTemplate(entry);
CreatureInfo const *ci = sObjectMgr.GetCreatureTemplate(entry);
if (!ci)
return false;
@@ -791,7 +791,7 @@ bool ChatHandler::HandleDebugSpawnVehicle(const char* args)
Map *map = m_session->GetPlayer()->GetMap();
if (!v->Create(objmgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, m_session->GetPlayer()->GetPhaseMask(), entry, id, m_session->GetPlayer()->GetTeam(), x, y, z, o))
if (!v->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, m_session->GetPlayer()->GetPhaseMask(), entry, id, m_session->GetPlayer()->GetTeam(), x, y, z, o))
{
delete v;
return false;
src/server/game/Chat/Commands/Level0.cpp
+2 -2
View File
@@ -205,7 +205,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
std::string password_new = new_pass;
std::string password_new_c = new_pass_c;
if (!accmgr.CheckPassword(m_session->GetAccountId(), password_old))
if (!sAccountMgr.CheckPassword(m_session->GetAccountId(), password_old))
{
SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
SetSentErrorMessage(true);
@@ -219,7 +219,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
return false;
}
AccountOpResult result = accmgr.ChangePassword(m_session->GetAccountId(), password_new);
AccountOpResult result = sAccountMgr.ChangePassword(m_session->GetAccountId(), password_new);
switch(result)
{
case AOR_OK:
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)
{
src/server/game/Chat/Commands/Level2.cpp
+54 -54
View File
@@ -65,7 +65,7 @@ bool ChatHandler::HandleMuteCommand(const char* args)
if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
return false;
uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
// find only player from same account if any
if (!target)
@@ -104,7 +104,7 @@ bool ChatHandler::HandleUnmuteCommand(const char* args)
if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
return false;
uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
// find only player from same account if any
if (!target)
@@ -152,7 +152,7 @@ bool ChatHandler::HandleGoTicketCommand(const char * args)
if (!ticket_id)
return false;
GM_Ticket *ticket = objmgr.GetGMTicket(ticket_id);
GM_Ticket *ticket = sObjectMgr.GetGMTicket(ticket_id);
if (!ticket)
{
SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -394,7 +394,7 @@ bool ChatHandler::HandleGoObjectCommand(const char* args)
int mapid;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(guid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(guid))
{
x = go_data->posX;
y = go_data->posY;
@@ -434,7 +434,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
{
Player* pl = m_session->GetPlayer();
QueryResult_AutoPtr result;
GameEventMgr::ActiveEvents const& activeEventsList = gameeventmgr.GetActiveEventList();
GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr.GetActiveEventList();
if (*args)
{
// number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
@@ -507,8 +507,8 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
o = fields[5].GetFloat();
mapid = fields[6].GetUInt16();
phase = fields[7].GetUInt16();
pool_id = poolhandler.IsPartOfAPool<GameObject>(lowguid);
if (!pool_id || poolhandler.IsSpawnedObject<GameObject>(lowguid))
pool_id = sPoolMgr.IsPartOfAPool<GameObject>(lowguid);
if (!pool_id || sPoolMgr.IsSpawnedObject<GameObject>(lowguid))
found = true;
} while (result->NextRow() && (!found));
@@ -518,7 +518,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
return false;
}
GameObjectInfo const* goI = objmgr.GetGameObjectInfo(id);
GameObjectInfo const* goI = sObjectMgr.GetGameObjectInfo(id);
if (!goI)
{
@@ -559,7 +559,7 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args)
GameObject* obj = NULL;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
if (!obj)
@@ -607,7 +607,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args)
GameObject* obj = NULL;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
if (!obj)
@@ -658,7 +658,7 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
GameObject* obj = NULL;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
if (!obj)
@@ -725,7 +725,7 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args)
char* spawntimeSecs = strtok(NULL, " ");
const GameObjectInfo *gInfo = objmgr.GetGameObjectInfo(id);
const GameObjectInfo *gInfo = sObjectMgr.GetGameObjectInfo(id);
if (!gInfo)
{
@@ -751,7 +751,7 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args)
Map *map = chr->GetMap();
GameObject* pGameObj = new GameObject;
uint32 db_lowGUID = objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
uint32 db_lowGUID = sObjectMgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
if (!pGameObj->Create(db_lowGUID, gInfo->id, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY))
{
@@ -781,7 +781,7 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args)
map->Add(pGameObj);
// TODO: is it really necessary to add both the real and DB table guid here ?
objmgr.AddGameobjectToGrid(db_lowGUID, objmgr.GetGOData(db_lowGUID));
sObjectMgr.AddGameobjectToGrid(db_lowGUID, sObjectMgr.GetGOData(db_lowGUID));
PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name,db_lowGUID,x,y,z);
return true;
@@ -802,7 +802,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args)
GameObject* obj = NULL;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
if (!obj)
@@ -850,7 +850,7 @@ bool ChatHandler::HandleGameObjectNearCommand(const char* args)
float z = fields[4].GetFloat();
int mapid = fields[5].GetUInt16();
GameObjectInfo const * gInfo = objmgr.GetGameObjectInfo(entry);
GameObjectInfo const * gInfo = sObjectMgr.GetGameObjectInfo(entry);
if (!gInfo)
continue;
@@ -1028,7 +1028,7 @@ bool ChatHandler::HandleNpcAddCommand(const char* args)
}
Creature* pCreature = new Creature;
if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
{
delete pCreature;
return false;
@@ -1042,7 +1042,7 @@ bool ChatHandler::HandleNpcAddCommand(const char* args)
pCreature->LoadFromDB(db_guid, map);
map->Add(pCreature);
objmgr.AddCreatureToGrid(db_guid, objmgr.GetCreatureData(db_guid));
sObjectMgr.AddCreatureToGrid(db_guid, sObjectMgr.GetCreatureData(db_guid));
return true;
}
@@ -1079,15 +1079,15 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
if (!objmgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,m_session->GetPlayer()))
if (!sObjectMgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,m_session->GetPlayer()))
{
SetSentErrorMessage(true);
return false;
}
objmgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
sObjectMgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
ItemPrototype const* pProto = sObjectMgr.GetItemPrototype(itemId);
PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
return true;
@@ -1116,14 +1116,14 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args)
}
uint32 itemId = atol(pitem);
if (!objmgr.RemoveVendorItem(vendor->GetEntry(),itemId))
if (!sObjectMgr.RemoveVendorItem(vendor->GetEntry(),itemId))
{
PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId);
SetSentErrorMessage(true);
return false;
}
ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
ItemPrototype const* pProto = sObjectMgr.GetItemPrototype(itemId);
PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,pProto->Name1);
return true;
@@ -1150,7 +1150,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
// attempt check creature existence by DB data
if (!pCreature)
{
CreatureData const* data = objmgr.GetCreatureData(lowguid);
CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
if (!data)
{
PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -1218,7 +1218,7 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args)
{
if (((Pet*)pCreature)->getPetType() == HUNTER_PET)
{
pCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, objmgr.GetXPForLevel(lvl)/4);
pCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForLevel(lvl)/4);
pCreature->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
}
((Pet*)pCreature)->GivePetLevel(lvl);
@@ -1275,7 +1275,7 @@ bool ChatHandler::HandleNpcDeleteCommand(const char* args)
if (!lowguid)
return false;
if (CreatureData const* cr_data = objmgr.GetCreatureData(lowguid))
if (CreatureData const* cr_data = sObjectMgr.GetCreatureData(lowguid))
unit = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid, cr_data->id, HIGHGUID_UNIT));
}
else
@@ -1322,7 +1322,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args)
// Attempting creature load from DB data
if (!pCreature)
{
CreatureData const* data = objmgr.GetCreatureData(lowguid);
CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
if (!data)
{
PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -1356,7 +1356,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args)
if (pCreature)
{
if (CreatureData const* data = objmgr.GetCreatureData(pCreature->GetDBTableGUIDLow()))
if (CreatureData const* data = sObjectMgr.GetCreatureData(pCreature->GetDBTableGUIDLow()))
{
const_cast<CreatureData*>(data)->posX = x;
const_cast<CreatureData*>(data)->posY = y;
@@ -1462,7 +1462,7 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
// attempt check creature existence by DB data
if (!pCreature)
{
CreatureData const* data = objmgr.GetCreatureData(lowguid);
CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
if (!data)
{
PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -1882,7 +1882,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/)
}
pCreature->SetName(args);
uint32 idname = objmgr.AddCreatureTemplate(pCreature->GetName());
uint32 idname = sObjectMgr.AddCreatureTemplate(pCreature->GetName());
pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
pCreature->SaveToDB();
@@ -1929,7 +1929,7 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/)
return true;
}
uint32 idname = objmgr.AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID));
uint32 idname = sObjectMgr.AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID));
pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
pCreature->SaveToDB();
@@ -2070,7 +2070,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
return false;
}
Player* player = objmgr.GetPlayer(kickName);
Player* player = sObjectMgr.GetPlayer(kickName);
if (!player)
{
SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -2162,7 +2162,7 @@ bool ChatHandler::HandleGOInfoCommand(const char* args)
else
entry = atoi((char*)args);
GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(entry);
GameObjectInfo const* goinfo = sObjectMgr.GetGameObjectInfo(entry);
if (!goinfo)
return false;
@@ -2861,7 +2861,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
wpCreature->AddObjectToRemoveList();
// re-create
Creature* wpCreature2 = new Creature;
if (!wpCreature2->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
if (!wpCreature2->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
{
PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT);
delete wpCreature2;
@@ -3066,7 +3066,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
float o = chr->GetOrientation();
Creature* wpCreature = new Creature;
if (!wpCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
if (!wpCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
{
PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
delete wpCreature;
@@ -3118,7 +3118,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
Map *map = chr->GetMap();
Creature* pCreature = new Creature;
if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
{
PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
delete pCreature;
@@ -3166,7 +3166,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
Map *map = chr->GetMap();
Creature* pCreature = new Creature;
if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
{
PSendSysMessage(LANG_WAYPOINT_NOTCREATED, id);
delete pCreature;
@@ -3422,8 +3422,8 @@ bool ChatHandler::HandleLookupEventCommand(const char* args)
bool found = false;
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
for (uint32 id = 0; id < events.size(); ++id)
{
@@ -3457,8 +3457,8 @@ bool ChatHandler::HandleEventActiveListCommand(const char* /*args*/)
{
uint32 counter = 0;
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
char const* active = GetTrinityString(LANG_ACTIVE);
@@ -3493,7 +3493,7 @@ bool ChatHandler::HandleEventInfoCommand(const char* args)
uint32 event_id = atoi(cId);
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
if (event_id >=events.size())
{
@@ -3510,14 +3510,14 @@ bool ChatHandler::HandleEventInfoCommand(const char* args)
return false;
}
GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
bool active = activeEvents.find(event_id) != activeEvents.end();
char const* activeStr = active ? GetTrinityString(LANG_ACTIVE) : "";
std::string startTimeStr = TimeToTimestampStr(eventData.start);
std::string endTimeStr = TimeToTimestampStr(eventData.end);
uint32 delay = gameeventmgr.NextCheck(event_id);
uint32 delay = sGameEventMgr.NextCheck(event_id);
time_t nextTime = time(NULL)+delay;
std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-";
@@ -3542,7 +3542,7 @@ bool ChatHandler::HandleEventStartCommand(const char* args)
int32 event_id = atoi(cId);
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
if (event_id < 1 || event_id >=events.size())
{
@@ -3559,7 +3559,7 @@ bool ChatHandler::HandleEventStartCommand(const char* args)
return false;
}
GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
if (activeEvents.find(event_id) != activeEvents.end())
{
PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id);
@@ -3567,7 +3567,7 @@ bool ChatHandler::HandleEventStartCommand(const char* args)
return false;
}
gameeventmgr.StartEvent(event_id,true);
sGameEventMgr.StartEvent(event_id,true);
return true;
}
@@ -3583,7 +3583,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args)
int32 event_id = atoi(cId);
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
if (event_id < 1 || event_id >=events.size())
{
@@ -3600,7 +3600,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args)
return false;
}
GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
if (activeEvents.find(event_id) == activeEvents.end())
{
@@ -3609,7 +3609,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args)
return false;
}
gameeventmgr.StopEvent(event_id,true);
sGameEventMgr.StopEvent(event_id,true);
return true;
}
@@ -3931,7 +3931,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* /*args*/)
return false;
}
CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creatureTarget->GetEntry());
CreatureInfo const* cInfo = sObjectMgr.GetCreatureTemplate(creatureTarget->GetEntry());
// Creatures with family 0 crashes the server
if (cInfo->family == 0)
{
@@ -3978,7 +3978,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* /*args*/)
// prepare visual effect for levelup
pet->SetUInt32Value(UNIT_FIELD_LEVEL,creatureTarget->getLevel()-1);
pet->GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
pet->GetCharmInfo()->SetPetNumber(sObjectMgr.GeneratePetNumber(), true);
// this enables pet details window (Shift+P)
pet->InitPetCreateSpells();
pet->SetHealth(pet->GetMaxHealth());
@@ -4102,7 +4102,7 @@ bool ChatHandler::HandleActivateObjectCommand(const char *args)
GameObject* obj = NULL;
// by DB guid
if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
if (!obj)
@@ -4241,7 +4241,7 @@ bool ChatHandler::HandleNpcSetLinkCommand(const char* args)
return false;
}
if (!objmgr.SetCreatureLinkedRespawn(pCreature->GetDBTableGUIDLow(), linkguid))
if (!sObjectMgr.SetCreatureLinkedRespawn(pCreature->GetDBTableGUIDLow(), linkguid))
{
PSendSysMessage("Selected creature can't link with guid '%u'", linkguid);
SetSentErrorMessage(true);
src/server/game/Chat/Commands/Level3.cpp
+119 -119
View File
@@ -126,7 +126,7 @@ bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/)
HandleReloadQuestTemplateCommand("a");
sLog.outString("Re-Loading Quests Relations...");
objmgr.LoadQuestRelations();
sObjectMgr.LoadQuestRelations();
SendGlobalGMSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded.");
return true;
}
@@ -210,7 +210,7 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
bool ChatHandler::HandleReloadAccessRequirementCommand(const char*)
{
sLog.outString("Re-Loading Access Requirement definitions...");
objmgr.LoadAccessRequirements();
sObjectMgr.LoadAccessRequirements();
SendGlobalGMSysMessage("DB table `access_requirement` reloaded.");
return true;
}
@@ -218,7 +218,7 @@ bool ChatHandler::HandleReloadAccessRequirementCommand(const char*)
bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*)
{
sLog.outString("Re-Loading Additional Achievement Criteria Data...");
achievementmgr.LoadAchievementCriteriaData();
sAchievementMgr.LoadAchievementCriteriaData();
SendGlobalGMSysMessage("DB table `achievement_criteria_data` reloaded.");
return true;
}
@@ -226,7 +226,7 @@ bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*)
bool ChatHandler::HandleReloadAchievementRewardCommand(const char*)
{
sLog.outString("Re-Loading Achievement Reward Data...");
achievementmgr.LoadRewards();
sAchievementMgr.LoadRewards();
SendGlobalGMSysMessage("DB table `achievement_reward` reloaded.");
return true;
}
@@ -234,7 +234,7 @@ bool ChatHandler::HandleReloadAchievementRewardCommand(const char*)
bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*)
{
sLog.outString("Re-Loading Tavern Area Triggers...");
objmgr.LoadTavernAreaTriggers();
sObjectMgr.LoadTavernAreaTriggers();
SendGlobalGMSysMessage("DB table `areatrigger_tavern` reloaded.");
return true;
}
@@ -242,7 +242,7 @@ bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*)
bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*)
{
sLog.outString("Re-Loading AreaTrigger teleport definitions...");
objmgr.LoadAreaTriggerTeleports();
sObjectMgr.LoadAreaTriggerTeleports();
SendGlobalGMSysMessage("DB table `areatrigger_teleport` reloaded.");
return true;
}
@@ -265,7 +265,7 @@ bool ChatHandler::HandleReloadCommandCommand(const char*)
bool ChatHandler::HandleReloadOnKillReputationCommand(const char*)
{
sLog.outString("Re-Loading creature award reputation definitions...");
objmgr.LoadReputationOnKill();
sObjectMgr.LoadReputationOnKill();
SendGlobalGMSysMessage("DB table `creature_onkill_reputation` reloaded.");
return true;
}
@@ -403,9 +403,9 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
const_cast<CreatureInfo*>(cInfo)->equipmentId = fields[79].GetUInt32();
const_cast<CreatureInfo*>(cInfo)->MechanicImmuneMask = fields[80].GetUInt32();
const_cast<CreatureInfo*>(cInfo)->flags_extra = fields[81].GetUInt32();
const_cast<CreatureInfo*>(cInfo)->ScriptID = objmgr.GetScriptId(fields[82].GetString());
const_cast<CreatureInfo*>(cInfo)->ScriptID = sObjectMgr.GetScriptId(fields[82].GetString());
objmgr.CheckCreatureTemplate(cInfo);
sObjectMgr.CheckCreatureTemplate(cInfo);
SendGlobalGMSysMessage("Creature template reloaded.");
return true;
@@ -414,7 +414,7 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*)
{
sLog.outString("Loading Quests Relations... (`creature_questrelation`)");
objmgr.LoadCreatureQuestRelations();
sObjectMgr.LoadCreatureQuestRelations();
SendGlobalGMSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded.");
return true;
}
@@ -422,7 +422,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*)
bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char * /*args*/)
{
sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)");
objmgr.LoadCreatureLinkedRespawn();
sObjectMgr.LoadCreatureLinkedRespawn();
SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded.");
return true;
}
@@ -430,7 +430,7 @@ bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char * /*args*/
bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*)
{
sLog.outString("Loading Quests Relations... (`creature_involvedrelation`)");
objmgr.LoadCreatureInvolvedRelations();
sObjectMgr.LoadCreatureInvolvedRelations();
SendGlobalGMSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded.");
return true;
}
@@ -438,7 +438,7 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*)
bool ChatHandler::HandleReloadGossipMenuCommand(const char*)
{
sLog.outString("Re-Loading `gossip_menu` Table!");
objmgr.LoadGossipMenu();
sObjectMgr.LoadGossipMenu();
SendGlobalGMSysMessage("DB table `gossip_menu` reloaded.");
sConditionMgr.LoadConditions(true);
return true;
@@ -447,7 +447,7 @@ bool ChatHandler::HandleReloadGossipMenuCommand(const char*)
bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*)
{
sLog.outString("Re-Loading `gossip_menu_option` Table!");
objmgr.LoadGossipMenuItems();
sObjectMgr.LoadGossipMenuItems();
SendGlobalGMSysMessage("DB table `gossip_menu_option` reloaded.");
sConditionMgr.LoadConditions(true);
return true;
@@ -456,7 +456,7 @@ bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*)
bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*)
{
sLog.outString("Loading Quests Relations... (`gameobject_questrelation`)");
objmgr.LoadGameobjectQuestRelations();
sObjectMgr.LoadGameobjectQuestRelations();
SendGlobalGMSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded.");
return true;
}
@@ -464,7 +464,7 @@ bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*)
bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*)
{
sLog.outString("Loading Quests Relations... (`gameobject_involvedrelation`)");
objmgr.LoadGameobjectInvolvedRelations();
sObjectMgr.LoadGameobjectInvolvedRelations();
SendGlobalGMSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded.");
return true;
}
@@ -472,7 +472,7 @@ bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*)
bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*)
{
sLog.outString("Re-Loading Quest Area Triggers...");
objmgr.LoadQuestAreaTriggers();
sObjectMgr.LoadQuestAreaTriggers();
SendGlobalGMSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded.");
return true;
}
@@ -480,12 +480,12 @@ bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*)
bool ChatHandler::HandleReloadQuestTemplateCommand(const char*)
{
sLog.outString("Re-Loading Quest Templates...");
objmgr.LoadQuests();
sObjectMgr.LoadQuests();
SendGlobalGMSysMessage("DB table `quest_template` (quest definitions) reloaded.");
/// dependent also from `gameobject` but this table not reloaded anyway
sLog.outString("Re-Loading GameObjects for quests...");
objmgr.LoadGameObjectForQuests();
sObjectMgr.LoadGameObjectForQuests();
SendGlobalGMSysMessage("Data GameObjects for quests reloaded.");
return true;
}
@@ -612,7 +612,7 @@ bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*)
bool ChatHandler::HandleReloadTrinityStringCommand(const char*)
{
sLog.outString("Re-Loading trinity_string Table!");
objmgr.LoadTrinityStrings();
sObjectMgr.LoadTrinityStrings();
SendGlobalGMSysMessage("DB table `trinity_string` reloaded.");
return true;
}
@@ -620,7 +620,7 @@ bool ChatHandler::HandleReloadTrinityStringCommand(const char*)
bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
{
sLog.outString("Re-Loading `npc_gossip` Table!");
objmgr.LoadNpcTextId();
sObjectMgr.LoadNpcTextId();
SendGlobalGMSysMessage("DB table `npc_gossip` reloaded.");
return true;
}
@@ -628,7 +628,7 @@ bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
bool ChatHandler::HandleReloadNpcTrainerCommand(const char*)
{
sLog.outString("Re-Loading `npc_trainer` Table!");
objmgr.LoadTrainerSpell();
sObjectMgr.LoadTrainerSpell();
SendGlobalGMSysMessage("DB table `npc_trainer` reloaded.");
return true;
}
@@ -636,7 +636,7 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(const char*)
bool ChatHandler::HandleReloadNpcVendorCommand(const char*)
{
sLog.outString("Re-Loading `npc_vendor` Table!");
objmgr.LoadVendors();
sObjectMgr.LoadVendors();
SendGlobalGMSysMessage("DB table `npc_vendor` reloaded.");
return true;
}
@@ -644,7 +644,7 @@ bool ChatHandler::HandleReloadNpcVendorCommand(const char*)
bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*)
{
sLog.outString("Re-Loading `points_of_interest` Table!");
objmgr.LoadPointsOfInterest();
sObjectMgr.LoadPointsOfInterest();
SendGlobalGMSysMessage("DB table `points_of_interest` reloaded.");
return true;
}
@@ -652,7 +652,7 @@ bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*)
bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*)
{
sLog.outString("Re-Loading `npc_spellclick_spells` Table!");
objmgr.LoadNPCSpellClickSpells();
sObjectMgr.LoadNPCSpellClickSpells();
SendGlobalGMSysMessage("DB table `npc_spellclick_spells` reloaded.");
return true;
}
@@ -660,7 +660,7 @@ bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*)
bool ChatHandler::HandleReloadReservedNameCommand(const char*)
{
sLog.outString("Loading ReservedNames... (`reserved_name`)");
objmgr.LoadReservedPlayersNames();
sObjectMgr.LoadReservedPlayersNames();
SendGlobalGMSysMessage("DB table `reserved_name` (player reserved names) reloaded.");
return true;
}
@@ -668,7 +668,7 @@ bool ChatHandler::HandleReloadReservedNameCommand(const char*)
bool ChatHandler::HandleReloadReputationRewardRateCommand(const char*)
{
sLog.outString( "Re-Loading `reputation_reward_rate` Table!" );
objmgr.LoadReputationRewardRate();
sObjectMgr.LoadReputationRewardRate();
SendGlobalSysMessage("DB table `reputation_reward_rate` reloaded.");
return true;
}
@@ -676,7 +676,7 @@ bool ChatHandler::HandleReloadReputationRewardRateCommand(const char*)
bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(const char*)
{
sLog.outString( "Re-Loading `reputation_spillover_template` Table!" );
objmgr.LoadReputationSpilloverTemplate();
sObjectMgr.LoadReputationSpilloverTemplate();
SendGlobalSysMessage("DB table `reputation_spillover_template` reloaded.");
return true;
}
@@ -700,7 +700,7 @@ bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/
bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/)
{
sLog.outString("Re-Loading Skill Fishing base level requirements...");
objmgr.LoadFishingBaseSkillLevel();
sObjectMgr.LoadFishingBaseSkillLevel();
SendGlobalGMSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded.");
return true;
}
@@ -708,7 +708,7 @@ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/)
bool ChatHandler::HandleReloadSpellAreaCommand(const char*)
{
sLog.outString("Re-Loading SpellArea Data...");
spellmgr.LoadSpellAreas();
sSpellMgr.LoadSpellAreas();
SendGlobalGMSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded.");
return true;
}
@@ -716,7 +716,7 @@ bool ChatHandler::HandleReloadSpellAreaCommand(const char*)
bool ChatHandler::HandleReloadSpellRequiredCommand(const char*)
{
sLog.outString("Re-Loading Spell Required Data... ");
spellmgr.LoadSpellRequired();
sSpellMgr.LoadSpellRequired();
SendGlobalGMSysMessage("DB table `spell_required` reloaded.");
return true;
}
@@ -724,7 +724,7 @@ bool ChatHandler::HandleReloadSpellRequiredCommand(const char*)
bool ChatHandler::HandleReloadSpellGroupsCommand(const char*)
{
sLog.outString("Re-Loading Spell Groups...");
spellmgr.LoadSpellGroups();
sSpellMgr.LoadSpellGroups();
SendGlobalGMSysMessage("DB table `spell_group` (spell groups) reloaded.");
return true;
}
@@ -732,7 +732,7 @@ bool ChatHandler::HandleReloadSpellGroupsCommand(const char*)
bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*)
{
sLog.outString("Re-Loading Spell Learn Spells...");
spellmgr.LoadSpellLearnSpells();
sSpellMgr.LoadSpellLearnSpells();
SendGlobalGMSysMessage("DB table `spell_learn_spell` reloaded.");
return true;
}
@@ -740,7 +740,7 @@ bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*)
bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*)
{
sLog.outString("Re-Loading Spell Linked Spells...");
spellmgr.LoadSpellLinked();
sSpellMgr.LoadSpellLinked();
SendGlobalGMSysMessage("DB table `spell_linked_spell` reloaded.");
return true;
}
@@ -748,7 +748,7 @@ bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*)
bool ChatHandler::HandleReloadSpellProcEventCommand(const char*)
{
sLog.outString("Re-Loading Spell Proc Event conditions...");
spellmgr.LoadSpellProcEvents();
sSpellMgr.LoadSpellProcEvents();
SendGlobalGMSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded.");
return true;
}
@@ -756,7 +756,7 @@ bool ChatHandler::HandleReloadSpellProcEventCommand(const char*)
bool ChatHandler::HandleReloadSpellBonusesCommand(const char*)
{
sLog.outString("Re-Loading Spell Bonus Data...");
spellmgr.LoadSpellBonusess();
sSpellMgr.LoadSpellBonusess();
SendGlobalGMSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded.");
return true;
}
@@ -764,7 +764,7 @@ bool ChatHandler::HandleReloadSpellBonusesCommand(const char*)
bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*)
{
sLog.outString("Re-Loading Spell target coordinates...");
spellmgr.LoadSpellTargetPositions();
sSpellMgr.LoadSpellTargetPositions();
SendGlobalGMSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded.");
return true;
}
@@ -772,7 +772,7 @@ bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*)
bool ChatHandler::HandleReloadSpellThreatsCommand(const char*)
{
sLog.outString("Re-Loading Aggro Spells Definitions...");
spellmgr.LoadSpellThreats();
sSpellMgr.LoadSpellThreats();
SendGlobalGMSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded.");
return true;
}
@@ -780,7 +780,7 @@ bool ChatHandler::HandleReloadSpellThreatsCommand(const char*)
bool ChatHandler::HandleReloadSpellGroupStackRulesCommand(const char*)
{
sLog.outString("Re-Loading Spell Group Stack Rules...");
spellmgr.LoadSpellGroupStackRules();
sSpellMgr.LoadSpellGroupStackRules();
SendGlobalGMSysMessage("DB table `spell_group_stack_rules` (spell stacking definitions) reloaded.");
return true;
}
@@ -788,7 +788,7 @@ bool ChatHandler::HandleReloadSpellGroupStackRulesCommand(const char*)
bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*)
{
sLog.outString("Re-Loading Spell pet auras...");
spellmgr.LoadSpellPetAuras();
sSpellMgr.LoadSpellPetAuras();
SendGlobalGMSysMessage("DB table `spell_pet_auras` reloaded.");
return true;
}
@@ -796,7 +796,7 @@ bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*)
bool ChatHandler::HandleReloadPageTextsCommand(const char*)
{
sLog.outString("Re-Loading Page Texts...");
objmgr.LoadPageTexts();
sObjectMgr.LoadPageTexts();
SendGlobalGMSysMessage("DB table `page_texts` reloaded.");
return true;
}
@@ -829,7 +829,7 @@ bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `gameobject_scripts`...");
objmgr.LoadGameObjectScripts();
sObjectMgr.LoadGameObjectScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `gameobject_scripts` reloaded.");
@@ -849,7 +849,7 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `event_scripts`...");
objmgr.LoadEventScripts();
sObjectMgr.LoadEventScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `event_scripts` reloaded.");
@@ -869,7 +869,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `waypoint_scripts`...");
objmgr.LoadWaypointScripts();
sObjectMgr.LoadWaypointScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded.");
@@ -881,7 +881,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*args*/)
{
sLog.outString("Re-Loading Texts from `creature_ai_texts`...");
CreatureEAI_Mgr.LoadCreatureEventAI_Texts();
sEventAIMgr.LoadCreatureEventAI_Texts();
SendGlobalGMSysMessage("DB table `creature_ai_texts` reloaded.");
return true;
}
@@ -889,7 +889,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*args*/)
bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*args*/)
{
sLog.outString("Re-Loading Summons from `creature_ai_summons`...");
CreatureEAI_Mgr.LoadCreatureEventAI_Summons();
sEventAIMgr.LoadCreatureEventAI_Summons();
SendGlobalGMSysMessage("DB table `creature_ai_summons` reloaded.");
return true;
}
@@ -897,7 +897,7 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*args*/)
bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* /*args*/)
{
sLog.outString("Re-Loading Scripts from `creature_ai_scripts`...");
CreatureEAI_Mgr.LoadCreatureEventAI_Scripts();
sEventAIMgr.LoadCreatureEventAI_Scripts();
SendGlobalGMSysMessage("DB table `creature_ai_scripts` reloaded.");
return true;
}
@@ -914,7 +914,7 @@ bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `quest_end_scripts`...");
objmgr.LoadQuestEndScripts();
sObjectMgr.LoadQuestEndScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `quest_end_scripts` reloaded.");
@@ -934,7 +934,7 @@ bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `quest_start_scripts`...");
objmgr.LoadQuestStartScripts();
sObjectMgr.LoadQuestStartScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `quest_start_scripts` reloaded.");
@@ -954,7 +954,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg)
if (*arg != 'a')
sLog.outString("Re-Loading Scripts from `spell_scripts`...");
objmgr.LoadSpellScripts();
sObjectMgr.LoadSpellScripts();
if (*arg != 'a')
SendGlobalGMSysMessage("DB table `spell_scripts` reloaded.");
@@ -965,7 +965,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg)
bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Script strings from `db_script_string`...");
objmgr.LoadDbScriptStrings();
sObjectMgr.LoadDbScriptStrings();
SendGlobalGMSysMessage("DB table `db_script_string` reloaded.");
return true;
}
@@ -974,7 +974,7 @@ bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Graveyard-zone links...");
objmgr.LoadGraveyardZones();
sObjectMgr.LoadGraveyardZones();
SendGlobalGMSysMessage("DB table `game_graveyard_zone` reloaded.");
@@ -985,7 +985,7 @@ bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Game Tele coordinates...");
objmgr.LoadGameTele();
sObjectMgr.LoadGameTele();
SendGlobalGMSysMessage("DB table `game_tele` reloaded.");
@@ -1005,7 +1005,7 @@ bool ChatHandler::HandleReloadDisablesCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*)
{
sLog.outString("Re-Loading Locales Achievement Reward Data...");
achievementmgr.LoadRewardLocales();
sAchievementMgr.LoadRewardLocales();
SendGlobalGMSysMessage("DB table `locales_achievement_reward` reloaded.");
return true;
}
@@ -1013,7 +1013,7 @@ bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*)
bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Creature ...");
objmgr.LoadCreatureLocales();
sObjectMgr.LoadCreatureLocales();
SendGlobalGMSysMessage("DB table `locales_creature` reloaded.");
return true;
}
@@ -1021,7 +1021,7 @@ bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Gameobject ... ");
objmgr.LoadGameObjectLocales();
sObjectMgr.LoadGameObjectLocales();
SendGlobalGMSysMessage("DB table `locales_gameobject` reloaded.");
return true;
}
@@ -1029,7 +1029,7 @@ bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Item ... ");
objmgr.LoadItemLocales();
sObjectMgr.LoadItemLocales();
SendGlobalGMSysMessage("DB table `locales_item` reloaded.");
return true;
}
@@ -1037,7 +1037,7 @@ bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesItemSetNameCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Item set name... ");
objmgr.LoadItemSetNameLocales();
sObjectMgr.LoadItemSetNameLocales();
SendGlobalGMSysMessage("DB table `locales_item_set_name` reloaded.");
return true;
}
@@ -1045,7 +1045,7 @@ bool ChatHandler::HandleReloadLocalesItemSetNameCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales NPC Text ... ");
objmgr.LoadNpcTextLocales();
sObjectMgr.LoadNpcTextLocales();
SendGlobalGMSysMessage("DB table `locales_npc_text` reloaded.");
return true;
}
@@ -1053,7 +1053,7 @@ bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Page Text ... ");
objmgr.LoadPageTextLocales();
sObjectMgr.LoadPageTextLocales();
SendGlobalGMSysMessage("DB table `locales_page_text` reloaded.");
return true;
}
@@ -1061,7 +1061,7 @@ bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Points Of Interest ... ");
objmgr.LoadPointOfInterestLocales();
sObjectMgr.LoadPointOfInterestLocales();
SendGlobalGMSysMessage("DB table `locales_points_of_interest` reloaded.");
return true;
}
@@ -1069,7 +1069,7 @@ bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/
bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Locales Quest ... ");
objmgr.LoadQuestLocales();
sObjectMgr.LoadQuestLocales();
SendGlobalGMSysMessage("DB table `locales_quest` reloaded.");
return true;
}
@@ -1077,7 +1077,7 @@ bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/)
bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/)
{
sLog.outString("Re-Loading Player level dependent mail rewards...");
objmgr.LoadMailLevelRewards();
sObjectMgr.LoadMailLevelRewards();
SendGlobalGMSysMessage("DB table `mail_level_reward` reloaded.");
return true;
}
@@ -1086,8 +1086,8 @@ bool ChatHandler::HandleReloadAuctionsCommand(const char * /*args*/)
{
///- Reload dynamic data tables from the database
sLog.outString("Re-Loading Auctions...");
auctionmgr.LoadAuctionItems();
auctionmgr.LoadAuctions();
sAuctionMgr.LoadAuctionItems();
sAuctionMgr.LoadAuctions();
SendGlobalGMSysMessage("Auctions reloaded.");
return true;
}
@@ -1147,13 +1147,13 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char *args)
}
// m_session == NULL only for console
targetAccountId = (isAccountNameGiven) ? accmgr.GetId(targetAccountName) : getSelectedPlayer()->GetSession()->GetAccountId();
targetAccountId = (isAccountNameGiven) ? sAccountMgr.GetId(targetAccountName) : getSelectedPlayer()->GetSession()->GetAccountId();
int32 gmRealmID = (isAccountNameGiven) ? atoi(arg3) : atoi(arg2);
uint32 plSecurity = m_session ? accmgr.GetSecurity(m_session->GetAccountId(), gmRealmID) : SEC_CONSOLE;
uint32 plSecurity = m_session ? sAccountMgr.GetSecurity(m_session->GetAccountId(), gmRealmID) : SEC_CONSOLE;
// can set security level only for target with less security and to less security that we have
// This is also reject self apply in fact
targetSecurity = accmgr.GetSecurity(targetAccountId, gmRealmID);
targetSecurity = sAccountMgr.GetSecurity(targetAccountId, gmRealmID);
if (targetSecurity >= plSecurity || gm >= plSecurity)
{
SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
@@ -1215,7 +1215,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char *args)
return false;
}
uint32 targetAccountId = accmgr.GetId(account_name);
uint32 targetAccountId = sAccountMgr.GetId(account_name);
if (!targetAccountId)
{
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -1235,7 +1235,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char *args)
return false;
}
AccountOpResult result = accmgr.ChangePassword(targetAccountId, szPassword1);
AccountOpResult result = sAccountMgr.ChangePassword(targetAccountId, szPassword1);
switch (result)
{
@@ -1356,7 +1356,7 @@ bool ChatHandler::HandleUnLearnCommand(const char *args)
}
if (allRanks)
spell_id = spellmgr.GetFirstSpellInChain (spell_id);
spell_id = sSpellMgr.GetFirstSpellInChain (spell_id);
if (target->HasSpell(spell_id))
target->removeSpell(spell_id,false,!allRanks);
@@ -2104,7 +2104,7 @@ bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/)
continue;
// skip spells with first rank learned as talent (and all talents then also)
uint32 first_rank = spellmgr.GetFirstSpellInChain(spellInfo->Id);
uint32 first_rank = sSpellMgr.GetFirstSpellInChain(spellInfo->Id);
if (GetTalentSpellCost(first_rank) > 0)
continue;
@@ -2309,7 +2309,7 @@ bool ChatHandler::HandleLearnCommand(const char *args)
else
targetPlayer->learnSpell(spell, false);
uint32 first_spell = spellmgr.GetFirstSpellInChain(spell);
uint32 first_spell = sSpellMgr.GetFirstSpellInChain(spell);
if (GetTalentSpellCost(first_spell))
targetPlayer->SendTalentsInfoData(false);
@@ -2368,7 +2368,7 @@ bool ChatHandler::HandleAddItemCommand(const char *args)
sLog.outDetail(GetTrinityString(LANG_ADDITEM), itemId, count);
ItemPrototype const *pProto = objmgr.GetItemPrototype(itemId);
ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(itemId);
if (!pProto)
{
PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemId);
@@ -2507,7 +2507,7 @@ bool ChatHandler::HandleListItemCommand(const char *args)
return false;
}
ItemPrototype const* itemProto = objmgr.GetItemPrototype(item_id);
ItemPrototype const* itemProto = sObjectMgr.GetItemPrototype(item_id);
if (!itemProto)
{
PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
@@ -2712,7 +2712,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args)
return false;
}
GameObjectInfo const * gInfo = objmgr.GetGameObjectInfo(go_id);
GameObjectInfo const * gInfo = sObjectMgr.GetGameObjectInfo(go_id);
if (!gInfo)
{
PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id);
@@ -2778,7 +2778,7 @@ bool ChatHandler::HandleGameObjectStateCommand(const char *args)
GameObject* gobj = NULL;
if (GameObjectData const* goData = objmgr.GetGOData(lowguid))
if (GameObjectData const* goData = sObjectMgr.GetGOData(lowguid))
gobj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id);
if (!gobj)
@@ -2842,7 +2842,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args)
return false;
}
CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(cr_id);
CreatureInfo const* cInfo = sObjectMgr.GetCreatureTemplate(cr_id);
if (!cInfo)
{
PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, cr_id);
@@ -2921,7 +2921,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args)
int loc_idx = GetSessionDbLocaleIndex();
if (loc_idx >= 0)
{
ItemLocale const *il = objmgr.GetItemLocale(pProto->ItemId);
ItemLocale const *il = sObjectMgr.GetItemLocale(pProto->ItemId);
if (il)
{
if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty())
@@ -3167,7 +3167,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args)
// unit32 used to prevent interpreting uint8 as char at output
// find rank of learned spell for learning spell, or talent rank
uint32 rank = talentCost ? talentCost : spellmgr.GetSpellRank(learn ? spellInfo->EffectTriggerSpell[0] : id);
uint32 rank = talentCost ? talentCost : sSpellMgr.GetSpellRank(learn ? spellInfo->EffectTriggerSpell[0] : id);
// send spell in "id - [name, rank N] [talent] [passive] [learn] [known]" format
std::ostringstream ss;
@@ -3227,7 +3227,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args)
bool found = false;
ObjectMgr::QuestMap const& qTemplates = objmgr.GetQuestTemplates();
ObjectMgr::QuestMap const& qTemplates = sObjectMgr.GetQuestTemplates();
for (ObjectMgr::QuestMap::const_iterator iter = qTemplates.begin(); iter != qTemplates.end(); ++iter)
{
Quest * qinfo = iter->second;
@@ -3235,7 +3235,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args)
int loc_idx = GetSessionDbLocaleIndex();
if (loc_idx >= 0)
{
QuestLocale const *il = objmgr.GetQuestLocale(qinfo->GetQuestId());
QuestLocale const *il = sObjectMgr.GetQuestLocale(qinfo->GetQuestId());
if (il)
{
if (il->Title.size() > loc_idx && !il->Title[loc_idx].empty())
@@ -3339,7 +3339,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args)
int loc_idx = GetSessionDbLocaleIndex();
if (loc_idx >= 0)
{
CreatureLocale const *cl = objmgr.GetCreatureLocale (id);
CreatureLocale const *cl = sObjectMgr.GetCreatureLocale (id);
if (cl)
{
if (cl->Name.size() > loc_idx && !cl->Name[loc_idx].empty ())
@@ -3409,7 +3409,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args)
int loc_idx = GetSessionDbLocaleIndex();
if (loc_idx >= 0)
{
GameObjectLocale const *gl = objmgr.GetGameObjectLocale(id);
GameObjectLocale const *gl = sObjectMgr.GetGameObjectLocale(id);
if (gl)
{
if (gl->Name.size() > loc_idx && !gl->Name[loc_idx].empty())
@@ -3761,7 +3761,7 @@ bool ChatHandler::HandleGuildCreateCommand(const char *args)
return false;
}
objmgr.AddGuild (guild);
sObjectMgr.AddGuild (guild);
return true;
}
@@ -3784,7 +3784,7 @@ bool ChatHandler::HandleGuildInviteCommand(const char *args)
return false;
std::string glName = guildStr;
Guild* targetGuild = objmgr.GetGuildByName (glName);
Guild* targetGuild = sObjectMgr.GetGuildByName (glName);
if (!targetGuild)
return false;
@@ -3806,7 +3806,7 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args)
if (!glId)
return false;
Guild* targetGuild = objmgr.GetGuildById (glId);
Guild* targetGuild = sObjectMgr.GetGuildById (glId);
if (!targetGuild)
return false;
@@ -3832,7 +3832,7 @@ bool ChatHandler::HandleGuildRankCommand(const char *args)
if (!glId)
return false;
Guild* targetGuild = objmgr.GetGuildById (glId);
Guild* targetGuild = sObjectMgr.GetGuildById (glId);
if (!targetGuild)
return false;
@@ -3855,7 +3855,7 @@ bool ChatHandler::HandleGuildDeleteCommand(const char *args)
std::string gld = guildStr;
Guild* targetGuild = objmgr.GetGuildByName (gld);
Guild* targetGuild = sObjectMgr.GetGuildByName (gld);
if (!targetGuild)
return false;
@@ -4137,7 +4137,7 @@ bool ChatHandler::HandleLinkGraveCommand(const char *args)
return false;
}
if (objmgr.AddGraveYardLink(g_id,zoneId,g_team))
if (sObjectMgr.AddGraveYardLink(g_id,zoneId,g_team))
PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id,zoneId);
else
PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id,zoneId);
@@ -4163,14 +4163,14 @@ bool ChatHandler::HandleNearGraveCommand(const char *args)
Player* player = m_session->GetPlayer();
uint32 zone_id = player->GetZoneId();
WorldSafeLocsEntry const* graveyard = objmgr.GetClosestGraveYard(
WorldSafeLocsEntry const* graveyard = sObjectMgr.GetClosestGraveYard(
player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(),player->GetMapId(),g_team);
if (graveyard)
{
uint32 g_id = graveyard->ID;
GraveYardData const* data = objmgr.FindGraveYardData(g_id,zone_id);
GraveYardData const* data = sObjectMgr.FindGraveYardData(g_id,zone_id);
if (!data)
{
PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR,g_id);
@@ -4287,7 +4287,7 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
if (const CreatureData* const linked = target->GetLinkedRespawnCreatureData())
if (CreatureInfo const *master = GetCreatureInfo(linked->id))
PSendSysMessage(LANG_NPCINFO_LINKGUID, objmgr.GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name);
PSendSysMessage(LANG_NPCINFO_LINKGUID, sObjectMgr.GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name);
if ((npcflags & UNIT_NPC_FLAG_VENDOR))
{
@@ -4356,7 +4356,7 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/)
uint32 ItemID = atoi(pItemID);
uint32 SlotID = atoi(pSlotID);
ItemPrototype* tmpItem = objmgr.GetItemPrototype(ItemID);
ItemPrototype* tmpItem = sObjectMgr.GetItemPrototype(ItemID);
bool added = false;
if (tmpItem)
@@ -4717,7 +4717,7 @@ bool ChatHandler::HandleTeleAddCommand(const char * args)
std::string name = args;
if (objmgr.GetGameTele(name))
if (sObjectMgr.GetGameTele(name))
{
SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
SetSentErrorMessage(true);
@@ -4732,7 +4732,7 @@ bool ChatHandler::HandleTeleAddCommand(const char * args)
tele.mapId = player->GetMapId();
tele.name = name;
if (objmgr.AddGameTele(tele))
if (sObjectMgr.AddGameTele(tele))
{
SendSysMessage(LANG_COMMAND_TP_ADDED);
}
@@ -4753,7 +4753,7 @@ bool ChatHandler::HandleTeleDelCommand(const char * args)
std::string name = args;
if (!objmgr.DeleteGameTele(name))
if (!sObjectMgr.DeleteGameTele(name))
{
SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
SetSentErrorMessage(true);
@@ -5237,7 +5237,7 @@ bool ChatHandler::HandleQuestAdd(const char *args)
uint32 entry = atol(cId);
Quest const* pQuest = objmgr.GetQuestTemplate(entry);
Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
if (!pQuest)
{
@@ -5291,7 +5291,7 @@ bool ChatHandler::HandleQuestRemove(const char *args)
uint32 entry = atol(cId);
Quest const* pQuest = objmgr.GetQuestTemplate(entry);
Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
if (!pQuest)
{
@@ -5341,7 +5341,7 @@ bool ChatHandler::HandleQuestComplete(const char *args)
uint32 entry = atol(cId);
Quest const* pQuest = objmgr.GetQuestTemplate(entry);
Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
// If player doesn't have the quest
if (!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
@@ -5383,7 +5383,7 @@ bool ChatHandler::HandleQuestComplete(const char *args)
}
else if (creature > 0)
{
if (CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creature))
if (CreatureInfo const* cInfo = sObjectMgr.GetCreatureTemplate(creature))
for (uint16 z = 0; z < creaturecount; ++z)
player->KilledMonster(cInfo,0);
}
@@ -5586,7 +5586,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char *args)
return false;
}
uint32 accountid = accmgr.GetId(account_name);
uint32 accountid = sAccountMgr.GetId(account_name);
if (!accountid)
{
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -5603,10 +5603,10 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args)
if (!extractPlayerTarget((char*)args,&target,&target_guid))
return false;
uint32 accountid = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
uint32 accountid = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
std::string accountname;
if (!accmgr.GetName(accountid,accountname))
if (!sAccountMgr.GetName(accountid,accountname))
{
PSendSysMessage(LANG_BANINFO_NOCHARACTER);
return true;
@@ -5763,7 +5763,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult_AutoPtr result)
account_name = fields[1].GetCppString();
// "character" case, name need extract from another DB
else
accmgr.GetName (account_id,account_name);
sAccountMgr.GetName (account_id,account_name);
// No SQL injection. id is uint32.
QueryResult_AutoPtr banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id);
@@ -5952,7 +5952,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
return false;
}
uint32 account_id = accmgr.GetId(account_name);
uint32 account_id = sAccountMgr.GetId(account_name);
if (!account_id)
{
account_id = atoi(account); // use original string
@@ -5964,7 +5964,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
}
}
if (!accmgr.GetName(account_id,account_name))
if (!sAccountMgr.GetName(account_id,account_name))
{
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
SetSentErrorMessage(true);
@@ -6008,7 +6008,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
return false;
}
if (objmgr.GetPlayerAccountIdByGUID(guid))
if (sObjectMgr.GetPlayerAccountIdByGUID(guid))
{
PSendSysMessage(LANG_CHARACTER_GUID_IN_USE,guid);
SetSentErrorMessage(true);
@@ -6067,10 +6067,10 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args)
return false;
}
guid = objmgr.GetPlayerGUIDByName(name);
guid = sObjectMgr.GetPlayerGUIDByName(name);
}
if (!objmgr.GetPlayerAccountIdByGUID(guid))
if (!sObjectMgr.GetPlayerAccountIdByGUID(guid))
{
PSendSysMessage(LANG_PLAYER_NOT_FOUND);
SetSentErrorMessage(true);
@@ -6558,9 +6558,9 @@ bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
{
PSendSysMessage("instances loaded: %d", sMapMgr.GetNumInstances());
PSendSysMessage("players in instances: %d", sMapMgr.GetNumPlayersInInstances());
PSendSysMessage("instance saves: %d", sInstanceSaveManager.GetNumInstanceSaves());
PSendSysMessage("players bound: %d", sInstanceSaveManager.GetNumBoundPlayersTotal());
PSendSysMessage("groups bound: %d", sInstanceSaveManager.GetNumBoundGroupsTotal());
PSendSysMessage("instance saves: %d", sInstanceSaveMgr.GetNumInstanceSaves());
PSendSysMessage("players bound: %d", sInstanceSaveMgr.GetNumBoundPlayersTotal());
PSendSysMessage("groups bound: %d", sInstanceSaveMgr.GetNumBoundGroupsTotal());
return true;
}
@@ -6664,7 +6664,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args)
return false;
account_id = player->GetSession()->GetAccountId();
accmgr.GetName(account_id,account_name);
sAccountMgr.GetName(account_id,account_name);
szExp = szAcc;
}
else
@@ -6678,7 +6678,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args)
return false;
}
account_id = accmgr.GetId(account_name);
account_id = sAccountMgr.GetId(account_name);
if (!account_id)
{
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -6756,7 +6756,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args)
if (!item_id)
return false;
ItemPrototype const* item_proto = objmgr.GetItemPrototype(item_id);
ItemPrototype const* item_proto = sObjectMgr.GetItemPrototype(item_id);
if (!item_proto)
{
PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
@@ -6909,7 +6909,7 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args)
return false;
}
PlayerInfo const* info = objmgr.GetPlayerInfo(player->getRace(), player->getClass());
PlayerInfo const* info = sObjectMgr.GetPlayerInfo(player->getRace(), player->getClass());
if (!info)
return false;
@@ -7024,7 +7024,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
{
name = TargetName;
normalizePlayerName(name);
player = objmgr.GetPlayer(name.c_str()); //get player by name
player = sObjectMgr.GetPlayer(name.c_str()); //get player by name
}
if (!player)
@@ -7090,7 +7090,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
{
name = TargetName;
normalizePlayerName(name);
player = objmgr.GetPlayer(name.c_str()); //get player by name
player = sObjectMgr.GetPlayer(name.c_str()); //get player by name
}
//effect