Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
QAston
2012-02-21 20:17:32 +01:00
parent f09b5a6bea
commit 18948755ca
3 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
sql/updates/world/2012_02_21_00_world_conditions.sql → sql/updates/world/2012_02_21_01_world_conditions.sql
View File

1
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -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);
}

1
src/server/game/Conditions/ConditionMgr.h
View File

@@ -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 :)