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 | |
| parent | cf93313316daf39465d36d08ca6a7c8e20ab1ce0 (diff) | |
Core/ConditionMgr: small cleanup, small fix
--HG--
branch : trunk
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 10 |
2 files changed, 7 insertions, 9 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; diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 1bc284eceb6..120a492d59c 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -54,11 +54,10 @@ enum ConditionType CONDITION_MAPID = 22, // map_id 0 +referenceID true if in map_id CONDITION_AREAID = 23, // area_id 0 +referenceID true if in area_id CONDITION_ITEM_TARGET = 24, // ItemRequiredTargetType, TargetEntry, 0 - CONDITION_SPELL = 25 // spell_id 0 +referenceID true if knows spell + CONDITION_SPELL = 25, // spell_id 0 +referenceID true if knows spell + CONDITION_MAX = 26 // MAX }; -#define MAX_CONDITION 25 // maximum value in ConditionType enum - enum ConditionSourceType { CONDITION_SOURCE_TYPE_NONE = 0,//DONE @@ -81,11 +80,10 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_SPELL = 17,//DONE CONDITION_SOURCE_TYPE_ITEM_REQUIRED_TARGET = 18,//DONE CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19,//DONE - CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20//DONE + CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20,//DONE + CONDITION_SOURCE_TYPE_MAX = 21//MAX }; -#define MAX_CONDITIONSOURCETYPE 21 - struct Condition { ConditionSourceType mSourceType; //SourceTypeOrReferenceId |