[9118] Fixed problem with not set AchievementCriteriaRequirementSet::…

…criteria_id This important for support ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT Signed-off-by: VladimirMangos <vladimir@getmangos.com>
mangos · Jan 7, 2010 · beed0d4 · beed0d4
1 parent c0c9919
commit beed0d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -182,10 +182,10 @@ struct AchievementCriteriaRequirement
 struct AchievementCriteriaRequirementSet
 {
         AchievementCriteriaRequirementSet() : criteria_id(0) {}
-        explicit AchievementCriteriaRequirementSet(uint32 id) : criteria_id(id) {}
         typedef std::vector<AchievementCriteriaRequirement> 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
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9117"
+ #define REVISION_NR "9118"
 #endif // __REVISION_NR_H__