nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 03:15:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): rename namespaces and macros to acore (#2454)

Browse Source
This commit is contained in:
Viste
2019-12-01 15:13:31 +03:00
committed by Francesco Borzì
parent e19e95e5d0
commit e22d78ecd6
278 changed files with 1292 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/game/Chat/Chat.cpp
View File

@@ -61,7 +61,7 @@ std::vector<ChatCommand> const& ChatHandler::getCommandTable()
std::string ChatHandler::PGetParseString(uint32 entry, ...) const
{
const char *format = GetTrinityString(entry);
const char *format = GetAcoreString(entry);
char str[1024];
va_list ap;
va_start(ap, entry);
@@ -70,9 +70,9 @@ std::string ChatHandler::PGetParseString(uint32 entry, ...) const
return std::string(str);
}
char const* ChatHandler::GetTrinityString(uint32 entry) const
char const* ChatHandler::GetAcoreString(uint32 entry) const
{
return m_session->GetTrinityString(entry);
return m_session->GetAcoreString(entry);
}
bool ChatHandler::isAvailable(ChatCommand const& cmd) const
@@ -211,12 +211,12 @@ void ChatHandler::SendGlobalGMSysMessage(const char *str)
void ChatHandler::SendSysMessage(uint32 entry)
{
SendSysMessage(GetTrinityString(entry));
SendSysMessage(GetAcoreString(entry));
}
void ChatHandler::PSendSysMessage(uint32 entry, ...)
{
const char *format = GetTrinityString(entry);
const char *format = GetAcoreString(entry);
va_list ap;
char str [2048];
va_start(ap, entry);
@@ -886,8 +886,8 @@ GameObject* ChatHandler::GetNearbyGameObject()
Player* pl = m_session->GetPlayer();
GameObject* obj = NULL;
Trinity::NearestGameObjectCheck check(*pl);
Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectCheck> searcher(pl, obj, check);
acore::NearestGameObjectCheck check(*pl);
acore::GameObjectLastSearcher<acore::NearestGameObjectCheck> searcher(pl, obj, check);
pl->VisitNearbyGridObject(SIZE_OF_GRIDS, searcher);
return obj;
}
@@ -904,13 +904,13 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid
if (!obj && sObjectMgr->GetGOData(lowguid)) // guid is DB guid of object
{
// search near player then
CellCoord p(Trinity::ComputeCellCoord(pl->GetPositionX(), pl->GetPositionY()));
CellCoord p(acore::ComputeCellCoord(pl->GetPositionX(), pl->GetPositionY()));
Cell cell(p);
Trinity::GameObjectWithDbGUIDCheck go_check(lowguid);
Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(pl, obj, go_check);
acore::GameObjectWithDbGUIDCheck go_check(lowguid);
acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck> checker(pl, obj, go_check);
TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
TypeContainerVisitor<acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
cell.Visit(p, object_checker, *pl->GetMap(), *pl, pl->GetGridActivationRange());
}
@@ -1217,9 +1217,9 @@ std::string ChatHandler::GetNameLink(Player* chr) const
return playerLink(chr->GetName());
}
char const* CliHandler::GetTrinityString(uint32 entry) const
char const* CliHandler::GetAcoreString(uint32 entry) const
{
return sObjectMgr->GetTrinityStringForDBCLocale(entry);
return sObjectMgr->GetAcoreStringForDBCLocale(entry);
}
bool CliHandler::isAvailable(ChatCommand const& cmd) const
@@ -1236,7 +1236,7 @@ void CliHandler::SendSysMessage(const char *str)
std::string CliHandler::GetNameLink() const
{
return GetTrinityString(LANG_CONSOLE_COMMAND);
return GetAcoreString(LANG_CONSOLE_COMMAND);
}
bool CliHandler::needReportToTarget(Player* /*chr*/) const