From 9ca7fc89a92e2988396cac6b452737e2ebeef3be Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 5 Jun 2021 23:00:06 +0200 Subject: Core/Reputation: Named all reputation flags (cherry picked from commit f6b919fafe45aaeba0c5572925e47562158314b1) --- src/server/scripts/Commands/cs_character.cpp | 12 ++++++------ src/server/scripts/Commands/cs_lookup.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 9a35f6f1c68..6b8fa1b2093 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -566,17 +566,17 @@ public: ss << ' ' << rankName << " (" << target->GetReputationMgr().GetReputation(factionEntry) << ')'; - if (faction.Flags & FACTION_FLAG_VISIBLE) + if (faction.Flags.HasFlag(ReputationFlags::Visible)) ss << handler->GetTrinityString(LANG_FACTION_VISIBLE); - if (faction.Flags & FACTION_FLAG_AT_WAR) + if (faction.Flags.HasFlag(ReputationFlags::AtWar)) ss << handler->GetTrinityString(LANG_FACTION_ATWAR); - if (faction.Flags & FACTION_FLAG_PEACE_FORCED) + if (faction.Flags.HasFlag(ReputationFlags::Peaceful)) ss << handler->GetTrinityString(LANG_FACTION_PEACE_FORCED); - if (faction.Flags & FACTION_FLAG_HIDDEN) + if (faction.Flags.HasFlag(ReputationFlags::Hidden)) ss << handler->GetTrinityString(LANG_FACTION_HIDDEN); - if (faction.Flags & FACTION_FLAG_INVISIBLE_FORCED) + if (faction.Flags.HasFlag(ReputationFlags::Header)) ss << handler->GetTrinityString(LANG_FACTION_INVISIBLE_FORCED); - if (faction.Flags & FACTION_FLAG_INACTIVE) + if (faction.Flags.HasFlag(ReputationFlags::Inactive)) ss << handler->GetTrinityString(LANG_FACTION_INACTIVE); handler->SendSysMessage(ss.str().c_str()); diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index d9d02aab36c..75ecd1b56fe 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -367,17 +367,17 @@ public: ss << ' ' << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ')'; - if (factionState->Flags & FACTION_FLAG_VISIBLE) + if (factionState->Flags.HasFlag(ReputationFlags::Visible)) ss << handler->GetTrinityString(LANG_FACTION_VISIBLE); - if (factionState->Flags & FACTION_FLAG_AT_WAR) + if (factionState->Flags.HasFlag(ReputationFlags::AtWar)) ss << handler->GetTrinityString(LANG_FACTION_ATWAR); - if (factionState->Flags & FACTION_FLAG_PEACE_FORCED) + if (factionState->Flags.HasFlag(ReputationFlags::Peaceful)) ss << handler->GetTrinityString(LANG_FACTION_PEACE_FORCED); - if (factionState->Flags & FACTION_FLAG_HIDDEN) + if (factionState->Flags.HasFlag(ReputationFlags::Hidden)) ss << handler->GetTrinityString(LANG_FACTION_HIDDEN); - if (factionState->Flags & FACTION_FLAG_INVISIBLE_FORCED) + if (factionState->Flags.HasFlag(ReputationFlags::Header)) ss << handler->GetTrinityString(LANG_FACTION_INVISIBLE_FORCED); - if (factionState->Flags & FACTION_FLAG_INACTIVE) + if (factionState->Flags.HasFlag(ReputationFlags::Inactive)) ss << handler->GetTrinityString(LANG_FACTION_INACTIVE); } else -- cgit v1.2.3