diff options
| author | Blaymoira <none@none> | 2009-03-06 20:14:07 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-06 20:14:07 +0100 |
| commit | b49732c04db0d5bf67bf78e73e9c22f2078fd47c (patch) | |
| tree | e445fa32d805789d966505ffac97535152e852f6 /src/game/Pet.cpp | |
| parent | ba05670747d7f5cc91ce4e623f2b89ba60e8081e (diff) | |
| parent | 0b9d3f95de06da9e23bdd075a286679395dab49c (diff) | |
*Merge
--HG--
branch : trunk
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 00452fc0d95..a5d80266242 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -83,12 +83,12 @@ Pet::Pet(PetType type) : Creature() m_auraUpdateMask = 0; // 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_spells.clear(); m_Auras.clear(); @@ -253,7 +253,7 @@ bool Pet::LoadPetFromDB( Unit* owner, uint32 petentry, uint32 petnumber, bool cu SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32()); SetUInt64Value(UNIT_FIELD_CREATEDBY, owner->GetGUID()); - m_charmInfo->SetReactState( ReactStates( fields[6].GetUInt8() )); + SetReactState( ReactStates( fields[6].GetUInt8() )); m_loyaltyPoints = fields[7].GetInt32(); uint32 savedhealth = fields[13].GetUInt32(); @@ -445,7 +445,7 @@ void Pet::SavePetToDB(PetSaveMode mode) << GetNativeDisplayId() << ", " << getLevel() << ", " << GetUInt32Value(UNIT_FIELD_PETEXPERIENCE) << ", " - << uint32(m_charmInfo->GetReactState()) << ", " + << uint32(GetReactState()) << ", " << m_loyaltyPoints << ", " << GetLoyaltyLevel() << ", " << m_TrainingPoints << ", " |