Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Achievements: pick more changes from 4.3.4/6.x branch, required after abee9046a6

Browse Source
This commit is contained in:
joschiwald
2015-02-23 01:22:41 +01:00
parent 092e61cd3d
commit 61ba5e4f34
3 changed files with 664 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/2015_02_23_00_world.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (6847, 7849);
INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
(6847, 12, 0, 0, ''),
(7849, 12, 1, 0, '');

1073
src/server/game/Achievements/AchievementMgr.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/server/game/Achievements/AchievementMgr.h
View File

@@ -293,9 +293,12 @@ class AchievementMgr
void CompletedCriteriaFor(AchievementEntry const* achievement);
bool IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement);
bool IsCompletedAchievement(AchievementEntry const* entry);
bool CanUpdateCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement);
bool CanUpdateCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement, uint32 miscValue1, uint32 miscValue2, Unit const* unit);
void BuildAllDataPacket(WorldPacket* data) const;
bool ConditionsSatisfied(AchievementCriteriaEntry const* criteria) const;
bool RequirementsSatisfied(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement, uint32 miscValue1, uint32 miscValue2, Unit const* unit) const;
Player* m_player;
CriteriaProgressMap m_criteriaProgress;
CompletedAchievementMap m_completedAchievements;
@@ -309,6 +312,9 @@ class AchievementGlobalMgr
~AchievementGlobalMgr() { }
public:
static char const* GetCriteriaTypeString(AchievementCriteriaTypes type);
static char const* GetCriteriaTypeString(uint32 type);
static AchievementGlobalMgr* instance()
{
static AchievementGlobalMgr instance;