From 7cd1f436be8cb3d6af474f2f09c03c556c50f1fb Mon Sep 17 00:00:00 2001
From: Spp <none@none>
Date: Tue, 13 Apr 2010 11:49:09 +0200
Subject: Fix compile warning in ObjectMgr::AddSpellToTrainer

--HG--
branch : trunk
---
 src/game/ObjectMgr.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 6b0b758007b..c4efb463732 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8132,9 +8132,10 @@ void ObjectMgr::LoadMailLevelRewards()
 
 bool ObjectMgr::AddSpellToTrainer(int32 entry, int32 spell, Field *fields, std::set<uint32> *skip_trainers, std::set<uint32> *talentIds)
 {
+    if (entry >= TRINITY_TRAINER_START_REF)
+        return false;
+
     CreatureInfo const* cInfo = GetCreatureTemplate(entry);
-if (entry < TRINITY_TRAINER_START_REF)
-{
     if (!cInfo)
     {
         sLog.outErrorDb("Table `npc_trainer` have entry for not existed creature template (Entry: %u), ignore", entry);
@@ -8215,10 +8216,8 @@ if (entry < TRINITY_TRAINER_START_REF)
             break;
         }
     }
-
     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);
-- 
cgit v1.2.3