diff options
| author | Spp <spp@jorge.gr> | 2012-11-27 13:02:04 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-27 13:03:12 +0100 |
| commit | e9544985608e551d3765dea525d63b30d2c03b17 (patch) | |
| tree | e4ffe11ce5d87171d623c3893a0275162f2307ab /src/server/game/Conditions | |
| parent | 2251d1bfae88b8f7d18d4111929f4bb03f4a4131 (diff) | |
Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 85d0cb36ca4..b0a466148fb 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -17,6 +17,7 @@ */ #include "ConditionMgr.h" +#include "AchievementMgr.h" #include "GameEventMgr.h" #include "InstanceScript.h" #include "ObjectMgr.h" @@ -1421,6 +1422,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) return true; } + bool ConditionMgr::isConditionTypeValid(Condition* cond) { if (cond->ConditionType == CONDITION_NONE || cond->ConditionType >= CONDITION_MAX) @@ -1584,7 +1586,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } case CONDITION_ACHIEVEMENT: { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(cond->ConditionValue1); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(cond->ConditionValue1); if (!achievement) { sLog->outError(LOG_FILTER_SQL, "Achivement condition has non existing achivement id (%u), skipped", cond->ConditionValue1); diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index cc23036c534..b544e966084 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -17,6 +17,7 @@ */ #include "DisableMgr.h" +#include "AchievementMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "SpellMgr.h" @@ -173,7 +174,7 @@ void LoadDisables() sLog->outError(LOG_FILTER_SQL, "Disable flags specified for outdoor PvP %u, useless data.", entry); break; case DISABLE_TYPE_ACHIEVEMENT_CRITERIA: - if (!sAchievementCriteriaStore.LookupEntry(entry)) + if (!sAchievementMgr->GetAchievementCriteria(entry)) { sLog->outError(LOG_FILTER_SQL, "Achievement Criteria entry %u from `disables` doesn't exist in dbc, skipped.", entry); continue; |