From 18948755ca025e2ded03443e0812efd7e02598ad Mon Sep 17 00:00:00 2001 From: QAston Date: Tue, 21 Feb 2012 20:17:32 +0100 Subject: Merge. --- src/server/game/Conditions/ConditionMgr.cpp | 1 + src/server/game/Conditions/ConditionMgr.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index af0c1a07c2b..766123e4b7d 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -589,6 +589,7 @@ bool ConditionMgr::CanHaveSourceGroupSet(ConditionSourceType sourceType) const sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION || sourceType == CONDITION_SOURCE_TYPE_VEHICLE_SPELL || sourceType == CONDITION_SOURCE_TYPE_SPELL_IMPLICIT_TARGET || + sourceType == CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT || sourceType == CONDITION_SOURCE_TYPE_SMART_EVENT); } diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index a1c6146d0cf..5a5e2dd1c2e 100755 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -218,7 +218,6 @@ class ConditionMgr bool addToSpellImplicitTargetConditions(Condition* cond); bool IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo, ConditionList const& conditions); - sourceType == CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT || void Clean(); // free up resources std::list AllocatedMemoryStore; // some garbage collection :) -- cgit v1.2.3