diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-06-15 14:45:28 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-06-15 14:45:28 +0200 |
commit | a8a5239aad6f0396948978bdeae0979e7a8dfa97 (patch) | |
tree | 6f29573525d6a14e06034df7fcc75a3bd402ed49 | |
parent | b38025d96ed578f01bf2361dde3bba65d56c80f4 (diff) |
Core/Objects: Added missed change to 9ec22fffa00135cd776afebe2899bf54fb52f15f
-rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index f1e8c7270f4..af9b6a38fc8 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -134,7 +134,7 @@ class Object uint32 GetEntry() const { return GetUInt32Value(OBJECT_FIELD_ENTRY); } void SetEntry(uint32 entry) { SetUInt32Value(OBJECT_FIELD_ENTRY, entry); } - void SetObjectScale(float scale) { SetFloatValue(OBJECT_FIELD_SCALE_X, scale); } + virtual void SetObjectScale(float scale) { SetFloatValue(OBJECT_FIELD_SCALE_X, scale); } TypeID GetTypeId() const { return m_objectTypeId; } bool isType(uint16 mask) const { return (mask & m_objectType); } diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 61b8ba5ea27..729a5466fe3 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -2088,6 +2088,6 @@ void Pet::SetDisplayId(uint32 modelId) if (Unit* owner = GetOwner()) if (Player* player = owner->ToPlayer()) - if (owner->ToPlayer()->GetGroup()) - owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MODEL_ID); + if (player->GetGroup()) + player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MODEL_ID); } |