From ffb7c7f25e5439c4d837ef3854fd20fd852d22cc Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 28 Aug 2016 12:26:03 +0200 Subject: [PATCH] Core/Achievements: Fix some comments --- src/server/game/Achievements/AchievementMgr.cpp | 1 + src/server/game/Achievements/AchievementMgr.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 08e573af19d..f05f2471291 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -233,6 +233,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) case ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE: return true; // not check correctness node indexes case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPPED_ITEM: + case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY: if (equipped_item.item_quality >= MAX_ITEM_QUALITY) { TC_LOG_ERROR("sql.sql", "Table `achievement_criteria_data` (Entry: %u Type: %u) for data type %s (%u) contains an unknown quality state value in value1 (%u), ignored.", diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index ae63b2d6aac..4736f148d9a 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -71,7 +71,7 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY = 22, // used on 3.3.5a branch ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE = 23, // title_id known (pvp) title, values from dbc ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24, // game_event_id 0 - ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 25, // item_quality + ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 25, // item_quality MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE }; @@ -150,7 +150,7 @@ struct AchievementCriteriaData uint32 max_score; } bg_loss_team_score; // ACHIEVEMENT_CRITERIA_DATA_TYPE_INSTANCE_SCRIPT = 18 (no data) - // ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPPED_ITEM = 19 + // ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPPED_ITEM = 19 struct { uint32 item_level; @@ -166,16 +166,16 @@ struct AchievementCriteriaData { uint32 title_id; } known_title; - // ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 23 - struct - { - uint32 item_quality; - } item; - // ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24 + // ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24 struct { uint32 id; } game_event; + // ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 25 + struct + { + uint32 item_quality; + } item; // raw struct {