mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

19
src/game/ObjectMgr.cpp
View file

@ -8120,14 +8120,6 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
// already checked as valid spell so exist. // already checked as valid spell so exist.
SpellEntry const *learnSpellinfo = sSpellStore.LookupEntry(trainerSpell.learnedSpell); 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)) if (SpellMgr::IsProfessionSpell(trainerSpell.learnedSpell))
{ {
data.trainerType = 2; data.trainerType = 2;
@ -8143,6 +8135,17 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
else else
trainerSpell.reqLevel = minLevel; 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; ++count;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11590" #define REVISION_NR "11591"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__