aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2012_02_21_01_world_conditions.sql (renamed from sql/updates/world/2012_02_21_00_world_conditions.sql)0
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.cpp1
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.h1
3 files changed, 1 insertions, 1 deletions
diff --git a/sql/updates/world/2012_02_21_00_world_conditions.sql b/sql/updates/world/2012_02_21_01_world_conditions.sql
index 54685868186..54685868186 100644
--- a/sql/updates/world/2012_02_21_00_world_conditions.sql
+++ b/sql/updates/world/2012_02_21_01_world_conditions.sql
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<Condition*> AllocatedMemoryStore; // some garbage collection :)