diff options
| author | maximius <none@none> | 2009-11-21 04:59:10 -0800 |
|---|---|---|
| committer | maximius <none@none> | 2009-11-21 04:59:10 -0800 |
| commit | 83fa9466defe8c2e551e7dc2bdbb836cadcd75ef (patch) | |
| tree | 4070367f53482c08275b621cc8f1d53437d93197 /src/game/Player.cpp | |
| parent | 9fc070bb1d52fef8adbd174dde2081fe1e6ec147 (diff) | |
*Oops, edited the wrong function in 11085dbb7da0 >.<' 5AM woes
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 381d8ec0748..1d86e6b45b2 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -3792,7 +3792,7 @@ bool Player::resetTalents(bool no_cost) */ PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->TalentID); - if (plrTalent != m_talents[m_activeSpec]->end()) + if (plrTalent != m_talents[m_activeSpec]->end( || !m_talents[m_activeSpec]->empty()) { for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { @@ -3821,7 +3821,8 @@ bool Player::resetTalents(bool no_cost) else ++itr; } - plrTalent->second->state = PLAYERSPELL_REMOVED; // mark the talent in the talent map as removed + if (!m_talents[m_activeSpec]->empty()) + plrTalent->second->state = PLAYERSPELL_REMOVED; // mark the talent in the talent map as removed } } } @@ -22016,7 +22017,7 @@ void Player::ActivateSpec(uint8 spec) continue; PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->TalentID); - if (plrTalent != m_talents[m_activeSpec]->end() || m_talents[m_activeSpec]->empty()) + if (plrTalent != m_talents[m_activeSpec]->end()) { for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { @@ -22045,8 +22046,7 @@ void Player::ActivateSpec(uint8 spec) else ++itr; } - if (!m_talents[m_activeSpec]->empty()) - plrTalent->second->state = PLAYERSPELL_REMOVED; // mark the talent in the talent map as removed + //plrTalent->second->state = PLAYERSPELL_REMOVED; // mark the talent in the talent map as removed } } } |