diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-08-24 20:24:14 +0200 |
|---|---|---|
| committer | SnapperRy <snapperryen@gmail.com> | 2016-08-24 20:24:14 +0200 |
| commit | 0d2ef2ac7155cedead2c7a7cafcd937a4e1dcd99 (patch) | |
| tree | 1a7a76ea2b43405627ca55255f4bb2fbded59974 /src | |
| parent | 0be073dacff97bc5ae5215368e28356a03b7767d (diff) | |
Core/Achievements: improve mergeability between branches
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 21ff1b234d8..75eb118fab0 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -71,10 +71,11 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE = 21, // class_id race_id ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY = 22, // N login on day of N-th Birthday ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE = 23, // title_id known (pvp) title, values from dbc - ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 24 // item_quality + // ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24, // 7.x only + ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 25 // item_quality }; -#define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 25 // maximum value in AchievementCriteriaDataType enum +#define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 26 // maximum value in AchievementCriteriaDataType enum struct AchievementCriteriaData { |