From 9ec22fffa00135cd776afebe2899bf54fb52f15f Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 11 Jun 2013 17:28:16 +0200 Subject: Core/Objects: Object scale will now also affect bounding radius and combat reach fields --- src/server/game/Entities/Pet/Pet.cpp | 13 +++++++++++++ src/server/game/Entities/Pet/Pet.h | 2 ++ 2 files changed, 15 insertions(+) (limited to 'src/server/game/Entities/Pet') diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 0af3fab8434..f6693ba2260 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -2078,3 +2078,16 @@ Player* Pet::GetOwner() const { return Minion::GetOwner()->ToPlayer(); } + +void Pet::SetDisplayId(uint32 modelId) +{ + Guardian::SetDisplayId(modelId); + + if (!isControlled()) + return; + + if (Unit* owner = GetOwner()) + if (Player* player = owner->ToPlayer()) + if (owner->ToPlayer()->GetGroup()) + owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MODEL_ID); +} diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index c7e4e850ae3..e0afef2b8e3 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -46,6 +46,8 @@ class Pet : public Guardian void AddToWorld(); void RemoveFromWorld(); + void SetDisplayId(uint32 modelId); + PetType getPetType() const { return m_petType; } void setPetType(PetType type) { m_petType = type; } bool isControlled() const { return getPetType() == SUMMON_PET || getPetType() == HUNTER_PET; } -- cgit v1.2.3