josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Oops, edited the wrong function in 11085dbb7da0 >.<' 5AM woes

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-21 04:59:10 -08:00
parent 9fc070bb1d
commit 83fa9466de
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+4 -4
View File
@@ -3792,7 +3792,7 @@ bool Player::resetTalents(bool no_cost)
*/ */
PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->TalentID); 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) for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{ {
@@ -3821,6 +3821,7 @@ bool Player::resetTalents(bool no_cost)
else else
++itr; ++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
} }
} }
@@ -22016,7 +22017,7 @@ void Player::ActivateSpec(uint8 spec)
continue; continue;
PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->TalentID); 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) for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{ {
@@ -22045,8 +22046,7 @@ void Player::ActivateSpec(uint8 spec)
else else
++itr; ++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
} }
} }
} }