diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-10-27 18:33:47 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-10-27 20:38:13 +0100 |
| commit | 1edac8ba5789dda7ac3bd25ee47e2ddb2a044825 (patch) | |
| tree | e0501b9d78d91a28df3a7c34e4ec3a49a956446e /src/server/game/Entities/SceneObject | |
| parent | c975bc2c657dad3b2eb5af32c103052cd59d9028 (diff) | |
Core/Objects: More minor refactors for SMSG_UPDATE_OBJECT building - move getting and writing field flags to shared function
(cherry picked from commit ee54ade3975748bf373162b2397328852dec6701)
# Conflicts:
# src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp
# src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.h
# src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp
# src/server/game/Entities/Item/AzeriteItem/AzeriteItem.h
Diffstat (limited to 'src/server/game/Entities/SceneObject')
| -rw-r--r-- | src/server/game/Entities/SceneObject/SceneObject.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/SceneObject/SceneObject.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/server/game/Entities/SceneObject/SceneObject.cpp b/src/server/game/Entities/SceneObject/SceneObject.cpp index e1ccc771db0..80f8e2c624e 100644 --- a/src/server/game/Entities/SceneObject/SceneObject.cpp +++ b/src/server/game/Entities/SceneObject/SceneObject.cpp @@ -136,17 +136,14 @@ bool SceneObject::Create(ObjectGuid::LowType lowGuid, SceneType type, uint32 sce return true; } -void SceneObject::BuildValuesCreate(ByteBuffer* data, Player const* target) const +void SceneObject::BuildValuesCreate(ByteBuffer* data, UF::UpdateFieldFlag flags, Player const* target) const { - UF::UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target); - *data << uint8(flags); m_objectData->WriteCreate(*data, flags, this, target); m_sceneObjectData->WriteCreate(*data, flags, this, target); } -void SceneObject::BuildValuesUpdate(ByteBuffer* data, Player const* target) const +void SceneObject::BuildValuesUpdate(ByteBuffer* data, UF::UpdateFieldFlag flags, Player const* target) const { - UF::UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target); *data << uint32(m_values.GetChangedObjectTypeMask()); if (m_values.HasChanged(TYPEID_OBJECT)) diff --git a/src/server/game/Entities/SceneObject/SceneObject.h b/src/server/game/Entities/SceneObject/SceneObject.h index d085b6d7303..73d4fb31c87 100644 --- a/src/server/game/Entities/SceneObject/SceneObject.h +++ b/src/server/game/Entities/SceneObject/SceneObject.h @@ -36,8 +36,8 @@ public: ~SceneObject(); protected: - void BuildValuesCreate(ByteBuffer* data, Player const* target) const override; - void BuildValuesUpdate(ByteBuffer* data, Player const* target) const override; + void BuildValuesCreate(ByteBuffer* data, UF::UpdateFieldFlag flags, Player const* target) const override; + void BuildValuesUpdate(ByteBuffer* data, UF::UpdateFieldFlag flags, Player const* target) const override; void ClearUpdateMask(bool remove) override; public: |