aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Achievements/AchievementMgr.cpp42
-rw-r--r--src/server/game/Achievements/AchievementMgr.h30
-rw-r--r--src/server/game/DataStores/DBCEnums.h3
3 files changed, 44 insertions, 31 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index defac64d78c..36edfab420c 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1990,33 +1990,39 @@ void AchievementMgr<Guild>::CompletedAchievement(AchievementEntry const* achieve
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS, achievement->Points, 0, 0, NULL, referencePlayer);
}
-struct VisibleAchievementPred
+struct VisibleAchievementCheck
{
- bool operator()(CompletedAchievementMap::value_type const& val)
+ AchievementEntry const* operator()(CompletedAchievementMap::value_type const& val)
{
AchievementEntry const* achievement = sAchievementMgr->GetAchievement(val.first);
- return achievement && !(achievement->Flags & ACHIEVEMENT_FLAG_HIDDEN);
+ if (achievement && !(achievement->Flags & ACHIEVEMENT_FLAG_HIDDEN))
+ return achievement;
+ return nullptr;
}
};
template<class T>
void AchievementMgr<T>::SendAllAchievementData(Player* /*receiver*/) const
{
- VisibleAchievementPred isVisible;
+ VisibleAchievementCheck filterInvisible;
WorldPackets::Achievement::AllAchievements achievementData;
achievementData.Earned.reserve(m_completedAchievements.size());
achievementData.Progress.reserve(m_criteriaProgress.size());
for (auto itr = m_completedAchievements.begin(); itr != m_completedAchievements.end(); ++itr)
{
- if (!isVisible(*itr))
+ AchievementEntry const* achievement = filterInvisible(*itr);
+ if (!achievement)
continue;
WorldPackets::Achievement::EarnedAchievement earned;
earned.Id = itr->first;
earned.Date = itr->second.date;
- earned.Owner = GetOwner()->GetGUID();
- earned.VirtualRealmAddress = earned.NativeRealmAddress = GetVirtualRealmAddress();
+ if (!(achievement->Flags & ACHIEVEMENT_FLAG_ACCOUNT))
+ {
+ earned.Owner = GetOwner()->GetGUID();
+ earned.VirtualRealmAddress = earned.NativeRealmAddress = GetVirtualRealmAddress();
+ }
achievementData.Earned.push_back(earned);
}
@@ -2039,7 +2045,7 @@ void AchievementMgr<T>::SendAllAchievementData(Player* /*receiver*/) const
template<>
void AchievementMgr<Guild>::SendAllAchievementData(Player* receiver) const
{
- VisibleAchievementPred isVisible;
+ VisibleAchievementCheck isVisible;
auto count = std::count_if(m_completedAchievements.begin(), m_completedAchievements.end(), isVisible);
@@ -2066,9 +2072,9 @@ void AchievementMgr<Player>::SendAchievementInfo(Player* receiver, uint32 /*achi
ObjectGuid guid = GetOwner()->GetGUID();
ObjectGuid counter;
- VisibleAchievementPred isVisible;
+ VisibleAchievementCheck filterInvisible;
size_t numCriteria = m_criteriaProgress.size();
- size_t numAchievements = std::count_if(m_completedAchievements.begin(), m_completedAchievements.end(), isVisible);
+ size_t numAchievements = std::count_if(m_completedAchievements.begin(), m_completedAchievements.end(), filterInvisible);
ByteBuffer criteriaData(numCriteria * 16);
WorldPacket data(SMSG_RESPOND_INSPECT_ACHIEVEMENTS, 1 + 8 + 3 + 3 + numAchievements * (4 + 4) + numCriteria * (0));
@@ -2136,7 +2142,7 @@ void AchievementMgr<Player>::SendAchievementInfo(Player* receiver, uint32 /*achi
for (CompletedAchievementMap::const_iterator itr = m_completedAchievements.begin(); itr != m_completedAchievements.end(); ++itr)
{
- if (!isVisible(*itr))
+ if (!filterInvisible(*itr))
continue;
data << uint32(itr->first);
@@ -3105,7 +3111,6 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
achievementCriteriaTree->ID = i;
achievementCriteriaTree->Achievement = achievementItr->second;
achievementCriteriaTree->Entry = tree;
- achievementCriteriaTree->Criteria = nullptr;
_achievementCriteriaTrees[achievementCriteriaTree->Entry->ID] = achievementCriteriaTree;
if (sCriteriaStore.LookupEntry(tree->CriteriaID))
@@ -3142,29 +3147,28 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
auto mod = _criteriaModifiers.find(criteria->ModifierTreeId);
if (mod != _criteriaModifiers.end())
achievementCriteria->Modifier = mod->second;
- else
- achievementCriteria->Modifier = nullptr;
_achievementCriteria[achievementCriteria->ID] = achievementCriteria;
- bool isGuild = false, isPlayer = false;
for (AchievementCriteriaTree const* tree : treeItr->second)
{
const_cast<AchievementCriteriaTree*>(tree)->Criteria = achievementCriteria;
if (tree->Achievement->Flags & ACHIEVEMENT_FLAG_GUILD)
- isGuild = true;
+ achievementCriteria->FlagsCu |= ACHIEVEMENT_CRITERIA_FLAG_CU_GUILD;
+ else if (tree->Achievement->Flags & ACHIEVEMENT_FLAG_ACCOUNT)
+ achievementCriteria->FlagsCu |= ACHIEVEMENT_CRITERIA_FLAG_CU_ACCOUNT;
else
- isPlayer = true;
+ achievementCriteria->FlagsCu |= ACHIEVEMENT_CRITERIA_FLAG_CU_PLAYER;
}
- if (isGuild)
+ if (achievementCriteria->FlagsCu & ACHIEVEMENT_CRITERIA_FLAG_CU_GUILD)
{
++guildCriterias;
_guildAchievementCriteriasByType[criteria->Type].push_back(achievementCriteria);
}
- if (isPlayer)
+ if (achievementCriteria->FlagsCu & (ACHIEVEMENT_CRITERIA_FLAG_CU_PLAYER | ACHIEVEMENT_CRITERIA_FLAG_CU_ACCOUNT))
{
++criterias;
_achievementCriteriasByType[criteria->Type].push_back(achievementCriteria);
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index a493ed9cdfa..755e86eeec8 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -40,11 +40,19 @@ struct ModifierTreeNode
typedef std::unordered_map<uint32, ModifierTreeNode*> ModifierTreeMap;
+enum AchievementCriteriaFlagsCu
+{
+ ACHIEVEMENT_CRITERIA_FLAG_CU_PLAYER = 0x1,
+ ACHIEVEMENT_CRITERIA_FLAG_CU_ACCOUNT = 0x2,
+ ACHIEVEMENT_CRITERIA_FLAG_CU_GUILD = 0x4
+};
+
struct AchievementCriteria
{
- uint32 ID;
- CriteriaEntry const* Entry;
- ModifierTreeNode const* Modifier;
+ uint32 ID = 0;
+ CriteriaEntry const* Entry = nullptr;
+ ModifierTreeNode const* Modifier = nullptr;
+ uint32 FlagsCu = 0;
};
typedef std::vector<AchievementCriteria const*> AchievementCriteriaList;
@@ -52,10 +60,10 @@ typedef std::unordered_map<uint32, AchievementCriteria*> AchievementCriteriaMap;
struct AchievementCriteriaTree
{
- uint32 ID;
- CriteriaTreeEntry const* Entry;
- AchievementEntry const* Achievement;
- AchievementCriteria const* Criteria;
+ uint32 ID = 0;
+ CriteriaTreeEntry const* Entry = nullptr;
+ AchievementEntry const* Achievement = nullptr;
+ AchievementCriteria const* Criteria = nullptr;
std::vector<AchievementCriteriaTree const*> Children;
};
@@ -68,10 +76,10 @@ typedef std::unordered_map<uint32, AchievementEntryList> AchievementListB
struct CriteriaProgress
{
- uint64 counter;
- time_t date; // latest update time.
- ObjectGuid PlayerGUID; // GUID of the player that completed this criteria (guild achievements)
- bool changed;
+ uint64 counter = 0;
+ time_t date = time_t(0); // latest update time.
+ ObjectGuid PlayerGUID; // GUID of the player that last updated the criteria
+ bool changed = false;
};
enum AchievementCriteriaDataType
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 299dd5a30c8..671e2816a19 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -90,7 +90,8 @@ enum AchievementFlags
ACHIEVEMENT_FLAG_SHOW_IN_GUILD_HEADER = 0x00002000, // Shows in guild news header
ACHIEVEMENT_FLAG_GUILD = 0x00004000, //
ACHIEVEMENT_FLAG_SHOW_GUILD_MEMBERS = 0x00008000, //
- ACHIEVEMENT_FLAG_SHOW_CRITERIA_MEMBERS = 0x00010000 //
+ ACHIEVEMENT_FLAG_SHOW_CRITERIA_MEMBERS = 0x00010000, //
+ ACHIEVEMENT_FLAG_ACCOUNT = 0x00020000
};
enum AchievementCriteriaCondition