From 0b3cf7883e33099191af3b2c7f239f2a89e186be Mon Sep 17 00:00:00 2001 From: GriffonHeart Date: Thu, 7 Jan 2010 20:03:42 +0300 Subject: [PATCH] [9118] Fixed problem with not set AchievementCriteriaRequirementSet::criteria_id This important for support ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT Signed-off-by: VladimirMangos --- src/game/AchievementMgr.cpp | 1 + src/game/AchievementMgr.h | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 5a0d3ede5..124195a4d 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -1912,6 +1912,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements() // this will allocate empty data set storage AchievementCriteriaRequirementSet& dataSet = m_criteriaRequirementMap[criteria_id]; + dataSet.SetCriteriaId(criteria_id); // counting disable criteria requirements if (data.requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_DISABLED) diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index be071a279..13eb01b64 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -182,10 +182,10 @@ struct AchievementCriteriaRequirement struct AchievementCriteriaRequirementSet { AchievementCriteriaRequirementSet() : criteria_id(0) {} - explicit AchievementCriteriaRequirementSet(uint32 id) : criteria_id(id) {} typedef std::vector Storage; void Add(AchievementCriteriaRequirement const& data) { storage.push_back(data); } bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const; + void SetCriteriaId(uint32 id) {criteria_id = id;} private: uint32 criteria_id; Storage storage; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 96e26231a..f0bbb1331 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9117" + #define REVISION_NR "9118" #endif // __REVISION_NR_H__