[svn] * Removing useless data accidentally committed.

* Applying ImpConfig patch.
* Note: QUEUE_FOR_GM currently disabled as it's not compatible with the ACE patch. Anyone care to rewrite it?
* Note2: This is untested - I may have done some mistakes here and there. Will try to compile now.

--HG--
branch : trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 74a6a3ef684..b6f3f44834e 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -2081,6 +2081,12 @@ void ObjectMgr::LoadPlayerInfo()
         //                                                0     1      2      3

         QueryResult *result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell");

 

+	QueryResult *result = NULL;

+	if(sWorld.getConfig(CONFIG_START_ALL_SPELLS))

+		result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell_custom");

+	else

+		result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell");

+

         uint32 count = 0;

 

         if (!result)

@@ -2089,7 +2095,7 @@ void ObjectMgr::LoadPlayerInfo()
 

             sLog.outString();

             sLog.outString( ">> Loaded %u player create spells", count );

-            sLog.outErrorDb( "Error loading `playercreateinfo_spell` table or empty table.");

+            sLog.outErrorDb( "Error loading player starting spells or empty table.");

         }

         else

         {