diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-08-27 16:10:11 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-08-27 16:10:11 +0100 |
| commit | 14d80d269dd7f9624983bc5a610e511f31ed33f0 (patch) | |
| tree | f4dafe85b046d91506ec345516aa8e82d4ec38f6 /src/server/game/Spells/SpellMgr.cpp | |
| parent | b2134dbbe300f6b0ff55d551295a56a67748056f (diff) | |
| parent | cc14e18664f50983e52398ec02c9f6b2b770ef85 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index b34b935e975..721a171917e 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -27,7 +27,6 @@ #include "Chat.h" #include "Spell.h" #include "BattlegroundMgr.h" -#include "CreatureAI.h" #include "MapManager.h" #include "BattlefieldWG.h" #include "BattlefieldMgr.h" @@ -3079,8 +3078,6 @@ void SpellMgr::LoadSpellInfoCustomAttributes() spellInfo->_InitializeExplicitTargetMask(); } - CreatureAI::FillAISpellInfo(); - TC_LOG_INFO(LOG_FILTER_SERVER_LOADING, ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime)); } |