aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-30 14:46:49 -0500
committermegamage <none@none>2009-08-30 14:46:49 -0500
commit6bd28d674925c759dbd0b91933dd1c5ccaf81502 (patch)
tree9de6811e19b1cdaaa0340afd98a9b7bb6cb5847c
parent6b5007475ae8ca7e5b1bc8c804c96f236b76586a (diff)
*Small cleanup of talent code.
--HG-- branch : trunk
-rw-r--r--src/game/Player.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index cf40e71a4cb..df1e1170dc2 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -21112,9 +21112,9 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
if( (getClassMask() & talentTabInfo->ClassMask) == 0 )
return;
- // find current max talent rank
- uint8 curtalent_maxrank = 0;
- for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+ // find current max talent rank (1~5)
+ uint8 curtalent_maxrank = 1;
+ for(uint8 rank = MAX_TALENT_RANK-1; rank > 0; --rank)
{
if(talentInfo->RankID[rank] && HasSpell(talentInfo->RankID[rank]))
{
@@ -21249,9 +21249,9 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
return;
- // find current max talent rank
- uint8 curtalent_maxrank = 0;
- for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+ // find current max talent rank (1~5)
+ uint8 curtalent_maxrank = 1;
+ for(uint8 rank = MAX_TALENT_RANK-1; rank > 0; --rank)
{
if(talentInfo->RankID[rank] && pet->HasSpell(talentInfo->RankID[rank]))
{
@@ -21438,7 +21438,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
if(talentInfo->TalentTab != talentTabId)
continue;
- // find max talent rank
+ // find max talent rank (0~4)
int8 curtalent_maxrank = -1;
for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{
@@ -21515,7 +21515,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data)
if(talentInfo->TalentTab != talentTabId)
continue;
- // find max talent rank
+ // find max talent rank (0~4)
int8 curtalent_maxrank = -1;
for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{