diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-06 18:29:55 -0800 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-06 18:29:55 -0800 |
| commit | 5f28502c0a5a6a480055705c59b074b5333d7d63 (patch) | |
| tree | faf284bcbe33753072e220b74d5e2f2b34194edb /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 14feb316e17d4fc3d21ac6d041c9992802ea102a (diff) | |
| parent | c19f78c36321aead01cc7ceb9fd80f049bf11c0f (diff) | |
Merge pull request #8738 from joschiwald/spell_proc_conditions
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it i...
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 2116a7dfe94..0526c9276f9 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -489,6 +489,7 @@ uint32 Condition::GetMaxAvailableConditionTargets() case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION: case CONDITION_SOURCE_TYPE_SMART_EVENT: case CONDITION_SOURCE_TYPE_NPC_VENDOR: + case CONDITION_SOURCE_TYPE_SPELL_PROC: return 2; default: return 1; @@ -1403,6 +1404,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) break; } case CONDITION_SOURCE_TYPE_SPELL: + case CONDITION_SOURCE_TYPE_SPELL_PROC: { SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(cond->SourceEntry); if (!spellProto) |