diff options
| author | Rat <none@none> | 2010-09-20 22:11:55 +0200 |
|---|---|---|
| committer | Rat <none@none> | 2010-09-20 22:11:55 +0200 |
| commit | 8e6ba6e7c94f4ec2a515380e7f6de831a680dbdb (patch) | |
| tree | b9095217889797d3b96dcdc27b412d8ae505daab /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | cf93313316daf39465d36d08ca6a7c8e20ab1ce0 (diff) | |
Core/ConditionMgr: small cleanup, small fix
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 3a59ccc43b7..aa9c84eecfc 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -281,7 +281,7 @@ bool ConditionMgr::IsPlayerMeetToConditions(Player* player, ConditionList condit ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType sType, uint32 uEntry) { ConditionList spellCond; - if (sType > CONDITION_SOURCE_TYPE_NONE && sType < MAX_CONDITIONSOURCETYPE) + if (sType > CONDITION_SOURCE_TYPE_NONE && sType < CONDITION_SOURCE_TYPE_MAX) { ConditionMap::const_iterator itr = m_ConditionMap.find(sType); if (itr != m_ConditionMap.end()) @@ -568,7 +568,7 @@ bool ConditionMgr::addToGossipMenuItems(Condition* cond) bool ConditionMgr::isSourceTypeValid(Condition* cond) { - if (cond->mSourceType == CONDITION_SOURCE_TYPE_NONE || cond->mSourceType >= MAX_CONDITIONSOURCETYPE) + if (cond->mSourceType == CONDITION_SOURCE_TYPE_NONE || cond->mSourceType >= CONDITION_SOURCE_TYPE_MAX) { sLog.outErrorDb("Invalid ConditionSourceType %u in `condition` table, ignoring.", uint32(cond->mSourceType)); return false; @@ -935,7 +935,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) } bool ConditionMgr::isConditionTypeValid(Condition* cond) { - if (cond->mConditionType == CONDITION_NONE || cond->mConditionType >= MAX_CONDITION) + if (cond->mConditionType == CONDITION_NONE || cond->mConditionType >= CONDITION_MAX) { sLog.outErrorDb("Invalid ConditionType %u at SourceEntry %u in `condition` table, ignoring.", uint32(cond->mConditionType),cond->mSourceEntry); return false; |