aboutsummaryrefslogtreecommitdiff
path: root/src/game/Pet.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-03-19 20:20:42 +0100
committerMachiavelli <none@none>2010-03-19 20:20:42 +0100
commit0c6368bd39bb129648ef0c9c9ed902e2484a4d8b (patch)
tree08b24c9efcc4ed2dfdd3e7c9e7b2ea273dcca1a8 /src/game/Pet.cpp
parent2b55eb2efeb323ce61927da38106e3d2077e178a (diff)
Fix hunter pet talent reset feature.
Thanks to Xanadu and nalimleinad for aiding research. --HG-- branch : trunk
Diffstat (limited to 'src/game/Pet.cpp')
-rw-r--r--src/game/Pet.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index bd8089870a4..1f89e94754d 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -81,12 +81,12 @@ void Pet::AddToWorld()
// Prevent stuck pets when zoning. Pets default to "follow" when added to world
// so we'll reset flags and let the AI handle things
- if (this->GetCharmInfo() && this->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+ if (GetCharmInfo() && GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
{
- this->GetCharmInfo()->SetIsCommandAttack(false);
- this->GetCharmInfo()->SetIsAtStay(false);
- this->GetCharmInfo()->SetIsFollowing(false);
- this->GetCharmInfo()->SetIsReturning(false);
+ GetCharmInfo()->SetIsCommandAttack(false);
+ GetCharmInfo()->SetIsAtStay(false);
+ GetCharmInfo()->SetIsFollowing(false);
+ GetCharmInfo()->SetIsReturning(false);
}
}
@@ -1629,7 +1629,7 @@ bool Pet::resetTalents(bool no_cost)
// unlearn if first rank is talent or learned by talent
if (itrFirstId == talentInfo->RankID[j] || spellmgr.IsSpellLearnToSpell(talentInfo->RankID[j],itrFirstId))
{
- removeSpell(itr->first,false);
+ unlearnSpell(itr->first,false);
itr = m_spells.begin();
continue;
}