diff options
Diffstat (limited to 'src/server/game/Achievements/AchievementMgr.cpp')
| -rwxr-xr-x | src/server/game/Achievements/AchievementMgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 77ce13d3a11..9354d8397a6 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -111,7 +111,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) case ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT: return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_CREATURE: - if (!creature.id || !sObjectMgr.GetCreatureTemplate(creature.id)) + if (!creature.id || !ObjectMgr::GetCreatureTemplate(creature.id)) { sLog.outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_CREATURE (%u) has non-existing creature id in value1 (%u), ignored.", criteria->ID, criteria->requiredType,dataType,creature.id); @@ -366,7 +366,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un } case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM: { - ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(miscvalue1); + ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(miscvalue1); if (!pProto) return false; return pProto->ItemLevel >= equipped_item.item_level && pProto->Quality >= equipped_item.item_quality; @@ -1261,7 +1261,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if (miscvalue2 != achievementCriteria->roll_greed_on_loot.rollValue) continue; - ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(miscvalue1); + ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(miscvalue1); if (!pProto) continue; @@ -2395,7 +2395,7 @@ void AchievementGlobalMgr::LoadRewards() //check mail data before item for report including wrong item case if (reward.sender) { - if (!sObjectMgr.GetCreatureTemplate(reward.sender)) + if (!ObjectMgr::GetCreatureTemplate(reward.sender)) { sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid creature entry %u as sender, mail reward skipped.", entry, reward.sender); reward.sender = 0; @@ -2415,7 +2415,7 @@ void AchievementGlobalMgr::LoadRewards() if (reward.itemId) { - if (!sObjectMgr.GetItemPrototype(reward.itemId)) + if (!ObjectMgr::GetItemPrototype(reward.itemId)) { sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid item id %u, reward mail will not contain item.", entry, reward.itemId); reward.itemId = 0; |