diff options
| author | megamage <none@none> | 2008-12-26 17:08:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-12-26 17:08:59 -0600 |
| commit | 8b209a441dba87ac0a80b6cf51a8643fca5c9738 (patch) | |
| tree | 6dd136aaa5a91f02468c3842a6ac6600ce48ff24 /src/game/Pet.cpp | |
| parent | 7346ed5951822d5b8f61817ff1ad95d2c4e2cd73 (diff) | |
*Update to Mangos 6949.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Pet.cpp')
| -rw-r--r-- | src/game/Pet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 5df1726f4f4..dc2ea0820b1 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -104,7 +104,7 @@ void Pet::RemoveFromWorld() Unit::RemoveFromWorld(); } -bool Pet::LoadPetFromDB( Unit* owner, uint32 petentry, uint32 petnumber, bool current ) +bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool current ) { m_loading = true; @@ -773,7 +773,6 @@ bool Pet::CreateBaseAtCreature(Creature* creature) SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, 0); SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0); SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, uint32((Trinity::XP::xp_to_level(creature->getLevel()))/4)); - SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); SetUInt32Value(UNIT_NPC_FLAGS, 0); CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(creature->GetCreatureInfo()->family); |