mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This important for support ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
GriffonHeart 2010-01-07 20:03:42 +03:00 • committed by VladimirMangos
parent 17c0ea7020
commit 0b3cf7883e
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/AchievementMgr.cpp
View file

@ -1912,6 +1912,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
// this will allocate empty data set storage // this will allocate empty data set storage
AchievementCriteriaRequirementSet& dataSet = m_criteriaRequirementMap[criteria_id]; AchievementCriteriaRequirementSet& dataSet = m_criteriaRequirementMap[criteria_id];
dataSet.SetCriteriaId(criteria_id);
// counting disable criteria requirements // counting disable criteria requirements
if (data.requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_DISABLED) if (data.requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_DISABLED)

2
src/game/AchievementMgr.h
View file

@ -182,10 +182,10 @@ struct AchievementCriteriaRequirement
struct AchievementCriteriaRequirementSet struct AchievementCriteriaRequirementSet
{ {
AchievementCriteriaRequirementSet() : criteria_id(0) {} AchievementCriteriaRequirementSet() : criteria_id(0) {}
explicit AchievementCriteriaRequirementSet(uint32 id) : criteria_id(id) {}
typedef std::vector<AchievementCriteriaRequirement> Storage; typedef std::vector<AchievementCriteriaRequirement> Storage;
void Add(AchievementCriteriaRequirement const& data) { storage.push_back(data); } void Add(AchievementCriteriaRequirement const& data) { storage.push_back(data); }
bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const; bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const;
void SetCriteriaId(uint32 id) {criteria_id = id;}
private: private:
uint32 criteria_id; uint32 criteria_id;
Storage storage; Storage storage;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9117" #define REVISION_NR "9118"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__