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

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

View File

@@ -258,7 +258,7 @@ public:
return true;
}
char const* active = activeEvents.find(id) != activeEvents.end() ? handler->GetTrinityString(LANG_ACTIVE) : "";
char const* active = activeEvents.find(id) != activeEvents.end() ? handler->GetAcoreString(LANG_ACTIVE) : "";
if (handler->GetSession())
handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, id, id, eventData.description.c_str(), active);
@@ -345,25 +345,25 @@ public:
if (factionState) // and then target != nullptr also
{
uint32 index = target->GetReputationMgr().GetReputationRankStrIndex(factionEntry);
std::string rankName = handler->GetTrinityString(index);
std::string rankName = handler->GetAcoreString(index);
ss << ' ' << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ')';
if (factionState->Flags & FACTION_FLAG_VISIBLE)
ss << handler->GetTrinityString(LANG_FACTION_VISIBLE);
ss << handler->GetAcoreString(LANG_FACTION_VISIBLE);
if (factionState->Flags & FACTION_FLAG_AT_WAR)
ss << handler->GetTrinityString(LANG_FACTION_ATWAR);
ss << handler->GetAcoreString(LANG_FACTION_ATWAR);
if (factionState->Flags & FACTION_FLAG_PEACE_FORCED)
ss << handler->GetTrinityString(LANG_FACTION_PEACE_FORCED);
ss << handler->GetAcoreString(LANG_FACTION_PEACE_FORCED);
if (factionState->Flags & FACTION_FLAG_HIDDEN)
ss << handler->GetTrinityString(LANG_FACTION_HIDDEN);
ss << handler->GetAcoreString(LANG_FACTION_HIDDEN);
if (factionState->Flags & FACTION_FLAG_INVISIBLE_FORCED)
ss << handler->GetTrinityString(LANG_FACTION_INVISIBLE_FORCED);
ss << handler->GetAcoreString(LANG_FACTION_INVISIBLE_FORCED);
if (factionState->Flags & FACTION_FLAG_INACTIVE)
ss << handler->GetTrinityString(LANG_FACTION_INACTIVE);
ss << handler->GetAcoreString(LANG_FACTION_INACTIVE);
}
else
ss << handler->GetTrinityString(LANG_FACTION_NOREPUTATION);
ss << handler->GetAcoreString(LANG_FACTION_NOREPUTATION);
handler->SendSysMessage(ss.str().c_str());
@@ -655,13 +655,13 @@ public:
switch (status)
{
case QUEST_STATUS_COMPLETE:
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE);
break;
case QUEST_STATUS_INCOMPLETE:
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE);
break;
case QUEST_STATUS_REWARDED:
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_REWARDED);
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED);
break;
default:
break;
@@ -745,13 +745,13 @@ public:
char const* knownStr = "";
if (target && target->HasSkill(id))
{
knownStr = handler->GetTrinityString(LANG_KNOWN);
knownStr = handler->GetAcoreString(LANG_KNOWN);
uint32 curValue = target->GetPureSkillValue(id);
uint32 maxValue = target->GetPureMaxSkillValue(id);
uint32 permValue = target->GetSkillPermBonusValue(id);
uint32 tempValue = target->GetSkillTempBonusValue(id);
char const* valFormat = handler->GetTrinityString(LANG_SKILL_VALUES);
char const* valFormat = handler->GetAcoreString(LANG_SKILL_VALUES);
snprintf(valStr, 50, valFormat, curValue, maxValue, permValue, tempValue);
}
@@ -853,7 +853,7 @@ public:
// include rank in link name
if (rank)
ss << handler->GetTrinityString(LANG_SPELL_RANK) << rank;
ss << handler->GetAcoreString(LANG_SPELL_RANK) << rank;
if (handler->GetSession())
ss << ' ' << localeNames[locale] << "]|h|r";
@@ -861,15 +861,15 @@ public:
ss << ' ' << localeNames[locale];
if (talent)
ss << handler->GetTrinityString(LANG_TALENT);
ss << handler->GetAcoreString(LANG_TALENT);
if (passive)
ss << handler->GetTrinityString(LANG_PASSIVE);
ss << handler->GetAcoreString(LANG_PASSIVE);
if (learn)
ss << handler->GetTrinityString(LANG_LEARN);
ss << handler->GetAcoreString(LANG_LEARN);
if (known)
ss << handler->GetTrinityString(LANG_KNOWN);
ss << handler->GetAcoreString(LANG_KNOWN);
if (active)
ss << handler->GetTrinityString(LANG_ACTIVE);
ss << handler->GetAcoreString(LANG_ACTIVE);
handler->SendSysMessage(ss.str().c_str());
@@ -941,7 +941,7 @@ public:
// include rank in link name
if (rank)
ss << handler->GetTrinityString(LANG_SPELL_RANK) << rank;
ss << handler->GetAcoreString(LANG_SPELL_RANK) << rank;
if (handler->GetSession())
ss << ' ' << localeNames[locale] << "]|h|r";
@@ -949,15 +949,15 @@ public:
ss << ' ' << localeNames[locale];
if (talent)
ss << handler->GetTrinityString(LANG_TALENT);
ss << handler->GetAcoreString(LANG_TALENT);
if (passive)
ss << handler->GetTrinityString(LANG_PASSIVE);
ss << handler->GetAcoreString(LANG_PASSIVE);
if (learn)
ss << handler->GetTrinityString(LANG_LEARN);
ss << handler->GetAcoreString(LANG_LEARN);
if (known)
ss << handler->GetTrinityString(LANG_KNOWN);
ss << handler->GetAcoreString(LANG_KNOWN);
if (active)
ss << handler->GetTrinityString(LANG_ACTIVE);
ss << handler->GetAcoreString(LANG_ACTIVE);
handler->SendSysMessage(ss.str().c_str());
@@ -1163,10 +1163,10 @@ public:
return true;
}
char const* knownStr = target && target->HasTitle(titleInfo) ? handler->GetTrinityString(LANG_KNOWN) : "";
char const* knownStr = target && target->HasTitle(titleInfo) ? handler->GetAcoreString(LANG_KNOWN) : "";
char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index
? handler->GetTrinityString(LANG_ACTIVE)
? handler->GetAcoreString(LANG_ACTIVE)
: "";
char titleNameStr[80];
@@ -1226,21 +1226,21 @@ public:
ss << id << " - [" << name << ']';
if (mapInfo->IsContinent())
ss << handler->GetTrinityString(LANG_CONTINENT);
ss << handler->GetAcoreString(LANG_CONTINENT);
switch (mapInfo->map_type)
{
case MAP_INSTANCE:
ss << handler->GetTrinityString(LANG_INSTANCE);
ss << handler->GetAcoreString(LANG_INSTANCE);
break;
case MAP_RAID:
ss << handler->GetTrinityString(LANG_RAID);
ss << handler->GetAcoreString(LANG_RAID);
break;
case MAP_BATTLEGROUND:
ss << handler->GetTrinityString(LANG_BATTLEGROUND);
ss << handler->GetAcoreString(LANG_BATTLEGROUND);
break;
case MAP_ARENA:
ss << handler->GetTrinityString(LANG_ARENA);
ss << handler->GetAcoreString(LANG_ARENA);
break;
}