nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-02 10:33:46 +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

18
src/server/game/World/World.cpp
View File

@@ -1396,7 +1396,7 @@ void World::SetInitialWorldSettings()
///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
sLog->outString();
sLog->outString("Loading Trinity strings...");
if (!sObjectMgr->LoadTrinityStrings())
if (!sObjectMgr->LoadAcoreStrings())
exit(1); // Error message displayed in function already
///- Update the realm entry in the database with the realm type from the config file
@@ -2148,7 +2148,7 @@ void World::Update(uint32 diff)
// so we don't have to do it in every packet that modifies auctions
AsyncAuctionListingMgr::SetAuctionListingAllowed(false);
{
TRINITY_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock());
ACORE_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock());
// pussywizard: handle auctions when the timer has passed
if (m_timers[WUPDATE_AUCTIONS].Passed())
@@ -2319,7 +2319,7 @@ void World::SendGlobalGMMessage(WorldPacket* packet, WorldSession* self, TeamId
}
}
namespace Trinity
namespace acore
{
class WorldWorldTextBuilder
{
@@ -2328,7 +2328,7 @@ namespace Trinity
explicit WorldWorldTextBuilder(uint32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) {}
void operator()(WorldPacketList& data_list, LocaleConstant loc_idx)
{
char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx);
char const* text = sObjectMgr->GetAcoreString(i_textId, loc_idx);
if (i_args)
{
@@ -2362,7 +2362,7 @@ namespace Trinity
uint32 i_textId;
va_list* i_args;
};
} // namespace Trinity
} // namespace acore
/// Send a System Message to all players (except self if mentioned)
void World::SendWorldText(uint32 string_id, ...)
@@ -2370,8 +2370,8 @@ void World::SendWorldText(uint32 string_id, ...)
va_list ap;
va_start(ap, string_id);
Trinity::WorldWorldTextBuilder wt_builder(string_id, &ap);
Trinity::LocalizedPacketListDo<Trinity::WorldWorldTextBuilder> wt_do(wt_builder);
acore::WorldWorldTextBuilder wt_builder(string_id, &ap);
acore::LocalizedPacketListDo<acore::WorldWorldTextBuilder> wt_do(wt_builder);
for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
{
if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld())
@@ -2389,8 +2389,8 @@ void World::SendGMText(uint32 string_id, ...)
va_list ap;
va_start(ap, string_id);
Trinity::WorldWorldTextBuilder wt_builder(string_id, &ap);
Trinity::LocalizedPacketListDo<Trinity::WorldWorldTextBuilder> wt_do(wt_builder);
acore::WorldWorldTextBuilder wt_builder(string_id, &ap);
acore::LocalizedPacketListDo<acore::WorldWorldTextBuilder> wt_do(wt_builder);
for (SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
{
if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld())