* Set Trinity referenced trainer start entry to 200000

* Removed unneeded bar loading code for trainers

--HG--
branch : trunk

2 files changed, 7 insertions, 11 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index d35e31e9b29..6b0b758007b 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8133,8 +8133,9 @@ void ObjectMgr::LoadMailLevelRewards()
 bool ObjectMgr::AddSpellToTrainer(int32 entry, int32 spell, Field *fields, std::set<uint32> *skip_trainers, std::set<uint32> *talentIds)
 {
     CreatureInfo const* cInfo = GetCreatureTemplate(entry);
-
-    if (!cInfo && entry > 0)
+if (entry < TRINITY_TRAINER_START_REF)
+{
+    if (!cInfo)
     {
         sLog.outErrorDb("Table `npc_trainer` have entry for not existed creature template (Entry: %u), ignore", entry);
         return false;
@@ -8217,24 +8218,16 @@ bool ObjectMgr::AddSpellToTrainer(int32 entry, int32 spell, Field *fields, std::
 
     return true;
 }
-
+}
 int ObjectMgr::LoadReferenceTrainer(int32 trainer, int32 spell, std::set<uint32> *skip_trainers, std::set<uint32> *talentIds)
 {
     QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT entry, spell,spellcost,reqskill,reqskillvalue,reqlevel FROM npc_trainer WHERE entry='%d'", spell);
     if (!result)
-    {
-        barGoLink bar(1);
-
-        bar.step();
         return 0;
-    }
-
-    barGoLink bar(result->GetRowCount());
 
     uint32 count = 0;
     do
     {
-        bar.step();
 
         Field* fields = result->Fetch();
 
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 1994ca593ae..538b21638f0 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -149,6 +149,9 @@ typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
 #define MIN_CREATURE_AI_TEXT_STRING_ID (-1)                 // 'creature_ai_texts'
 #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000)
 
+// Trinity Trainer Reference start range
+#define TRINITY_TRAINER_START_REF      200000
+
 struct TrinityStringLocale
 {
     std::vector<std::string> Content;                       // 0 -> default, i -> i-1 locale index