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

[9659] Simplify resetTalent code.

Browse source 
Currently all code related to deepndent spells unlern exist in removeSpell
so not need do it in special way in talentReset.
This commit is contained in:
VladimirMangos 2010-04-02 23:09:17 +04:00
parent eee89851a6
commit 12426b158d
2 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/game/Player.cpp
View file

@ -3659,35 +3659,8 @@ bool Player::resetTalents(bool no_cost)
continue; continue;
for (int j = 0; j < MAX_TALENT_RANK; ++j) for (int j = 0; j < MAX_TALENT_RANK; ++j)
{ if (talentInfo->RankID[j])
for(PlayerSpellMap::iterator itr = GetSpellMap().begin(); itr != GetSpellMap().end();) removeSpell(talentInfo->RankID[j],!IsPassiveSpell(talentInfo->RankID[j]),false);
{
if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled)
{
++itr;
continue;
}
// remove learned spells (all ranks)
uint32 itrFirstId = sSpellMgr.GetFirstSpellInChain(itr->first);
// unlearn if first rank is talent or learned by talent
if (itrFirstId == talentInfo->RankID[j])
{
removeSpell(itr->first,!IsPassiveSpell(itr->first),false);
itr = GetSpellMap().begin();
continue;
}
else if (sSpellMgr.IsSpellLearnToSpell(talentInfo->RankID[j],itrFirstId))
{
removeSpell(itr->first,!IsPassiveSpell(itr->first));
itr = GetSpellMap().begin();
continue;
}
else
++itr;
}
}
} }
UpdateFreeTalentPoints(false); UpdateFreeTalentPoints(false);

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 "9658" #define REVISION_NR "9659"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__