From 6b0189fed3bdd6eda386852a58b85cf37d6794e5 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 21 Feb 2010 03:25:23 +0300 Subject: [PATCH] [9426] Really rename to ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM_LVL --- src/game/AchievementMgr.cpp | 4 ++-- src/game/AchievementMgr.h | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 22870f06f..0c27304af 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -243,7 +243,7 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri return false; } return true; - case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM: + case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM_LVL: if(equipped_item.item_quality >= MAX_ITEM_QUALITY) { sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM (%u) have unknown quality state in value1 (%u), ignore.", @@ -346,7 +346,7 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou } return data->CheckAchievementCriteriaMeet(criteria_id, source, target, miscvalue1); } - case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM: + case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM_LVL: { Item* item = source->GetItemByPos(INVENTORY_SLOT_BAG_0,miscvalue1); if (!item) diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 96cabc5ef..69966d4af 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -61,7 +61,7 @@ enum AchievementCriteriaRequirementType ACHIEVEMENT_CRITERIA_REQUIRE_HOLIDAY = 16, // holiday_id 0 event in holiday time ACHIEVEMENT_CRITERIA_REQUIRE_BG_LOSS_TEAM_SCORE = 17, // min_score max_score player's team win bg and opposition team have team score in range ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT = 18, // 0 0 maker instance script call for check current criteria requirements fit - ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM = 19, // item_level item_quality fir equipped item in slot `misc1` to item level and quality + ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM_LVL = 19, // item_level item_quality fir equipped item in slot `misc1` to item level and quality }; #define MAX_ACHIEVEMENT_CRITERIA_REQUIREMENT_TYPE 20 // maximum value in AchievementCriteriaRequirementType enum diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8c82ba2f1..4c68a9479 100644 --- 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 "9425" + #define REVISION_NR "9426" #endif // __REVISION_NR_H__