[11591] Apply spellLevel as reqlevel for non-prof. training spell only.

This commit is contained in:
VladimirMangos 2011-06-03 12:15:33 +04:00
parent c870ef324d
commit 02cbb905fa
2 changed files with 12 additions and 9 deletions

View file

@ -8120,14 +8120,6 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
// already checked as valid spell so exist.
SpellEntry const *learnSpellinfo = sSpellStore.LookupEntry(trainerSpell.learnedSpell);
if (trainerSpell.reqLevel)
{
if (trainerSpell.reqLevel == learnSpellinfo->spellLevel)
ERROR_DB_STRICT_LOG("Table `%s` (Entry: %u) has redundant reqlevel %u (=spell level) for spell %u", tableName, entry, trainerSpell.reqLevel, spell);
}
else
trainerSpell.reqLevel = learnSpellinfo->spellLevel;
if (SpellMgr::IsProfessionSpell(trainerSpell.learnedSpell))
{
data.trainerType = 2;
@ -8143,6 +8135,17 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
else
trainerSpell.reqLevel = minLevel;
}
// for non-prof. spell use spellLevel if not provided any
else
{
if (trainerSpell.reqLevel)
{
if (trainerSpell.reqLevel == learnSpellinfo->spellLevel)
ERROR_DB_STRICT_LOG("Table `%s` (Entry: %u) has redundant reqlevel %u (=spell level) for spell %u", tableName, entry, trainerSpell.reqLevel, spell);
}
else
trainerSpell.reqLevel = learnSpellinfo->spellLevel;
}
++count;