HIGHLY EXPERIMENTAL - USE AT YOUR OWN RISK

implemented Condition System
all systems should work like before
after applying the sql converter you won't be able to apply any Updatepacks (<=up30) so do updates before this
this revesion is not threated as stable!

--HG--
branch : trunk

1 files changed, 4 insertions, 6 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 04f0c46a7d5..1629aa61af9 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -70,6 +70,7 @@
 #include "ScriptMgr.h"
 #include "AddonMgr.h"
 #include "LFGMgr.h"
+#include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(World);
 
@@ -1380,12 +1381,6 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Creature templates...");
     objmgr.LoadCreatureTemplates();
 
-    sLog.outString("Loading SpellsScriptTarget...");
-    spellmgr.LoadSpellScriptTarget();                       // must be after LoadCreatureTemplates and LoadGameobjectInfo
-
-    sLog.outString("Loading ItemRequiredTarget...");
-    objmgr.LoadItemRequiredTarget();
-
     sLog.outString("Loading Creature Reputation OnKill Data...");
     objmgr.LoadReputationOnKill();
 
@@ -1578,6 +1573,9 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Creature Formations...");
     formation_mgr.LoadCreatureFormations();
 
+    sLog.outString("Loading Conditions...");
+    sConditionMgr.LoadConditions();
+
     sLog.outString("Loading GM tickets...");
     objmgr.LoadGMTickets();