*Minor correction in talent resetting, and cosmetic change in spec swapping.

--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-20 23:04:39 -08:00
parent e4e61ac99d
commit db132054fd
+3 -6
View File
@@ -3786,10 +3786,6 @@ bool Player::resetTalents(bool no_cost)
PlayerTalentMap::const_iterator foundTalent = m_talents[m_activeSpec]->find(i); PlayerTalentMap::const_iterator foundTalent = m_talents[m_activeSpec]->find(i);
if (foundTalent == m_talents[m_activeSpec]->end() || foundTalent->second->state == PLAYERSPELL_REMOVED) if (foundTalent == m_talents[m_activeSpec]->end() || foundTalent->second->state == PLAYERSPELL_REMOVED)
continue; continue;
else
foundTalent->second->state = PLAYERSPELL_REMOVED;
removeSpell(i, !IsPassiveSpell(i), false);
/* /*
for (PlayerTalentMap::iterator itr = m_talents[m_activeSpec]->begin(); itr != m_talents[m_activeSpec]->end(); ++itr) for (PlayerTalentMap::iterator itr = m_talents[m_activeSpec]->begin(); itr != m_talents[m_activeSpec]->end(); ++itr)
@@ -3829,6 +3825,8 @@ bool Player::resetTalents(bool no_cost)
++itr; ++itr;
} }
} }
removeSpell(i, !IsPassiveSpell(i), false);
foundTalent->second->state = PLAYERSPELL_REMOVED;
} }
SetFreeTalentPoints(talentPointsForLevel); SetFreeTalentPoints(talentPointsForLevel);
@@ -22011,8 +22009,6 @@ void Player::ActivateSpec(uint8 spec)
if (!talentInfo) if (!talentInfo)
continue; continue;
removeSpell(itr->first, !IsPassiveSpell(itr->first), false);
for (uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) for (uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank)
{ {
for (PlayerSpellMap::iterator itr2 = GetSpellMap().begin(); itr2 != GetSpellMap().end();) for (PlayerSpellMap::iterator itr2 = GetSpellMap().begin(); itr2 != GetSpellMap().end();)
@@ -22043,6 +22039,7 @@ void Player::ActivateSpec(uint8 spec)
++itr2; ++itr2;
} }
} }
removeSpell(itr->first, !IsPassiveSpell(itr->first), false);
} }
// set glyphs // set glyphs