diff options
| author | Meji <alvaro.megias@outlook.com> | 2023-03-30 18:54:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-30 18:54:27 +0200 |
| commit | 81ea6f54d93ee10b03e6432c6071e0d0983796a2 (patch) | |
| tree | 8e94c4d807ee69c2a3800f8cd9c360c460952a24 /src/server/game/Entities/Pet | |
| parent | 229a7ac79d38b9db76387f92e846c04c151ad3aa (diff) | |
Core/Creatures: Compute CombatReach and BoundingRadius using DisplayScale (#28863)
Diffstat (limited to 'src/server/game/Entities/Pet')
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 99c70474cad..10283386cc6 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -271,8 +271,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c m_charmInfo->SetPetNumber(petInfo->PetNumber, IsPermanentPetFor(owner)); - SetDisplayId(petInfo->DisplayId); - SetNativeDisplayId(petInfo->DisplayId); + SetDisplayId(petInfo->DisplayId, true); uint8 petlevel = petInfo->Level; ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); ReplaceAllNpcFlags2(UNIT_NPC_FLAG_2_NONE); @@ -1832,9 +1831,9 @@ float Pet::GetNativeObjectScale() const return Guardian::GetNativeObjectScale(); } -void Pet::SetDisplayId(uint32 modelId, float displayScale /*= 1.f*/) +void Pet::SetDisplayId(uint32 modelId, bool setNative /*= false*/) { - Guardian::SetDisplayId(modelId, displayScale); + Guardian::SetDisplayId(modelId, setNative); if (!isControlled()) return; diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 2a0dfde8466..0a671d6d549 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -52,7 +52,7 @@ class TC_GAME_API Pet : public Guardian void RemoveFromWorld() override; float GetNativeObjectScale() const override; - void SetDisplayId(uint32 modelId, float displayScale = 1.f) override; + void SetDisplayId(uint32 modelId, bool setNative = false) override; PetType getPetType() const { return m_petType; } void setPetType(PetType type) { m_petType = type; } |