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

32
src/server/game/Battlegrounds/Battleground.cpp
View File

@@ -36,7 +36,7 @@
#ifdef ELUNA
#include "LuaEngine.h"
#endif
namespace Trinity
namespace acore
{
class BattlegroundChatBuilder
{
@@ -46,7 +46,7 @@ namespace Trinity
void operator()(WorldPacket& data, LocaleConstant loc_idx)
{
char const* text = sObjectMgr->GetTrinityString(_textId, loc_idx);
char const* text = sObjectMgr->GetAcoreString(_textId, loc_idx);
if (_args)
{
// we need copy va_list before use or original va_list will corrupted
@@ -83,9 +83,9 @@ namespace Trinity
void operator()(WorldPacket& data, LocaleConstant loc_idx)
{
char const* text = sObjectMgr->GetTrinityString(_textId, loc_idx);
char const* arg1str = _arg1 ? sObjectMgr->GetTrinityString(_arg1, loc_idx) : "";
char const* arg2str = _arg2 ? sObjectMgr->GetTrinityString(_arg2, loc_idx) : "";
char const* text = sObjectMgr->GetAcoreString(_textId, loc_idx);
char const* arg1str = _arg1 ? sObjectMgr->GetAcoreString(_arg1, loc_idx) : "";
char const* arg2str = _arg2 ? sObjectMgr->GetAcoreString(_arg2, loc_idx) : "";
char str[2048];
snprintf(str, 2048, text, arg1str, arg2str);
@@ -100,7 +100,7 @@ namespace Trinity
uint32 _arg1;
uint32 _arg2;
};
} // namespace Trinity
} // namespace acore
template<class Do>
void Battleground::BroadcastWorker(Do& _do)
@@ -1064,7 +1064,7 @@ uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const
{
//variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)
uint32 maxLevel = std::min<uint32>(GetMaxLevel(), 80U);
return Trinity::Honor::hk_honor_at_level(maxLevel, float(kills));
return acore::Honor::hk_honor_at_level(maxLevel, float(kills));
}
void Battleground::BlockMovement(Player* player)
@@ -1745,8 +1745,8 @@ void Battleground::SendMessageToAll(uint32 entry, ChatMsg type, Player const* so
if (!entry)
return;
Trinity::BattlegroundChatBuilder bg_builder(type, entry, source);
Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder);
acore::BattlegroundChatBuilder bg_builder(type, entry, source);
acore::LocalizedPacketDo<acore::BattlegroundChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
}
@@ -1758,8 +1758,8 @@ void Battleground::PSendMessageToAll(uint32 entry, ChatMsg type, Player const* s
va_list ap;
va_start(ap, source);
Trinity::BattlegroundChatBuilder bg_builder(type, entry, source, &ap);
Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder);
acore::BattlegroundChatBuilder bg_builder(type, entry, source, &ap);
acore::LocalizedPacketDo<acore::BattlegroundChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
va_end(ap);
@@ -1775,7 +1775,7 @@ void Battleground::SendWarningToAll(uint32 entry, ...)
{
if (localizedPackets.find(itr->second->GetSession()->GetSessionDbLocaleIndex()) == localizedPackets.end())
{
char const* format = sObjectMgr->GetTrinityString(entry, itr->second->GetSession()->GetSessionDbLocaleIndex());
char const* format = sObjectMgr->GetAcoreString(entry, itr->second->GetSession()->GetSessionDbLocaleIndex());
char str[1024];
va_list ap;
@@ -1792,8 +1792,8 @@ void Battleground::SendWarningToAll(uint32 entry, ...)
void Battleground::SendMessage2ToAll(uint32 entry, ChatMsg type, Player const* source, uint32 arg1, uint32 arg2)
{
Trinity::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
Trinity::LocalizedPacketDo<Trinity::Battleground2ChatBuilder> bg_do(bg_builder);
acore::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
acore::LocalizedPacketDo<acore::Battleground2ChatBuilder> bg_do(bg_builder);
BroadcastWorker(bg_do);
}
@@ -1804,10 +1804,10 @@ void Battleground::EndNow()
}
// To be removed
char const* Battleground::GetTrinityString(int32 entry)
char const* Battleground::GetAcoreString(int32 entry)
{
// FIXME: now we have different DBC locales and need localized message for each target client
return sObjectMgr->GetTrinityStringForDBCLocale(entry);
return sObjectMgr->GetAcoreStringForDBCLocale(entry);
}
void Battleground::HandleTriggerBuff(GameObject* gameObject)