josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile warning in ObjectMgr::AddSpellToTrainer

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-13 11:49:09 +02:00
parent 2202c4fa97
commit 7cd1f436be
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ObjectMgr.cpp
+3 -4
View File
@@ -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) 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); CreatureInfo const* cInfo = GetCreatureTemplate(entry);
if (entry < TRINITY_TRAINER_START_REF)
{
if (!cInfo) if (!cInfo)
{ {
sLog.outErrorDb("Table `npc_trainer` have entry for not existed creature template (Entry: %u), ignore", entry); 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; break;
} }
} }
return true; return true;
} }
}
int ObjectMgr::LoadReferenceTrainer(int32 trainer, int32 spell, std::set<uint32> *skip_trainers, std::set<uint32> *talentIds) 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); QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT entry, spell,spellcost,reqskill,reqskillvalue,reqlevel FROM npc_trainer WHERE entry='%d'", spell);