diff options
Diffstat (limited to 'src/game/Pet.cpp')
| -rw-r--r-- | src/game/Pet.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 77851ed6cbc..d722809f4c1 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -51,12 +51,12 @@ m_declinedname(NULL) m_regenTimer = 4000; // pets always have a charminfo, even if they are not actually charmed - CharmInfo* charmInfo = InitCharmInfo(this); + CharmInfo* charmInfo = InitCharmInfo(); if(type == MINI_PET || type == POSSESSED_PET) // always passive - charmInfo->SetReactState(REACT_PASSIVE); + SetReactState(REACT_PASSIVE); else if(type == GUARDIAN_PET) // always aggressive - charmInfo->SetReactState(REACT_AGGRESSIVE); + SetReactState(REACT_AGGRESSIVE); //m_isActive = true; } @@ -213,7 +213,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32()); SetCreatorGUID(owner->GetGUID()); - m_charmInfo->SetReactState(ReactStates(fields[6].GetUInt8())); + SetReactState( ReactStates( fields[6].GetUInt8() )); uint32 savedhealth = fields[11].GetUInt32(); uint32 savedmana = fields[12].GetUInt32(); @@ -404,7 +404,7 @@ void Pet::SavePetToDB(PetSaveMode mode) << GetNativeDisplayId() << ", " << getLevel() << ", " << GetUInt32Value(UNIT_FIELD_PETEXPERIENCE) << ", " - << uint32(m_charmInfo->GetReactState()) << ", " + << uint32(GetReactState()) << ", " << uint32(GetFreeTalentPoints()) << ", " << uint32(mode) << ", '" << name.c_str() << "', " |