Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Objects: Replace separate x,y,z,o getters for stationary position with single Position

Browse Source
This commit is contained in:
Shauren
2025-06-17 23:09:08 +02:00
parent e78a7835d6
commit de740f0e76
6 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/AreaTrigger/AreaTrigger.h
View File

@@ -80,10 +80,7 @@ class TC_GAME_API AreaTrigger final : public WorldObject, public GridObject<Area
bool IsNeverVisibleFor(WorldObject const* seer, bool allowServersideObjects = false) const override;
float GetStationaryX() const override { return _stationaryPosition.GetPositionX(); }
float GetStationaryY() const override { return _stationaryPosition.GetPositionY(); }
float GetStationaryZ() const override { return _stationaryPosition.GetPositionZ(); }
float GetStationaryO() const override { return _stationaryPosition.GetOrientation(); }
Position const& GetStationaryPosition() const override { return _stationaryPosition; }
void RelocateStationaryPosition(Position const& pos) { _stationaryPosition.Relocate(pos); }
void PlaySpellVisual(uint32 spellVisualId) const;

5
src/server/game/Entities/Conversation/Conversation.h
View File

@@ -70,10 +70,7 @@ class TC_GAME_API Conversation final : public WorldObject, public GridObject<Con
ObjectGuid GetOwnerGUID() const override { return GetCreatorGUID(); }
uint32 GetFaction() const override { return 0; }
float GetStationaryX() const override { return _stationaryPosition.GetPositionX(); }
float GetStationaryY() const override { return _stationaryPosition.GetPositionY(); }
float GetStationaryZ() const override { return _stationaryPosition.GetPositionZ(); }
float GetStationaryO() const override { return _stationaryPosition.GetOrientation(); }
Position const& GetStationaryPosition() const override { return _stationaryPosition; }
void RelocateStationaryPosition(Position const& pos) { _stationaryPosition.Relocate(pos); }
Milliseconds const* GetLineStartTime(LocaleConstant locale, int32 lineId) const;

7
src/server/game/Entities/GameObject/GameObject.h
View File

@@ -405,12 +405,9 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject>
Transport* ToTransport() { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return reinterpret_cast<Transport*>(this); else return nullptr; }
Transport const* ToTransport() const { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return reinterpret_cast<Transport const*>(this); else return nullptr; }
float GetStationaryX() const override { return m_stationaryPosition.GetPositionX(); }
float GetStationaryY() const override { return m_stationaryPosition.GetPositionY(); }
float GetStationaryZ() const override { return m_stationaryPosition.GetPositionZ(); }
float GetStationaryO() const override { return m_stationaryPosition.GetOrientation(); }
Position const& GetStationaryPosition() const { return m_stationaryPosition; }
Position const& GetStationaryPosition() const override { return m_stationaryPosition; }
void RelocateStationaryPosition(float x, float y, float z, float o) { m_stationaryPosition.Relocate(x, y, z, o); }
void RelocateStationaryPosition(Position const& pos) { m_stationaryPosition.Relocate(pos); }
void AfterRelocation();

5
src/server/game/Entities/Object/Object.cpp
View File

@@ -465,10 +465,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags, Playe
if (flags.Stationary)
{
WorldObject const* self = static_cast<WorldObject const*>(this);
*data << float(self->GetStationaryX());
*data << float(self->GetStationaryY());
*data << float(self->GetStationaryZ());
*data << float(self->GetStationaryO());
*data << self->GetStationaryPosition().PositionXYZOStream();
}
if (flags.CombatVictim)

5
src/server/game/Entities/Object/Object.h
View File

@@ -911,10 +911,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
MovementInfo m_movementInfo;
virtual float GetStationaryX() const { return GetPositionX(); }
virtual float GetStationaryY() const { return GetPositionY(); }
virtual float GetStationaryZ() const { return GetPositionZ(); }
virtual float GetStationaryO() const { return GetOrientation(); }
virtual Position const& GetStationaryPosition() const { return *this; }
float GetFloorZ() const;
virtual float GetCollisionHeight() const { return 0.0f; }

5
src/server/game/Entities/SceneObject/SceneObject.h
View File

@@ -69,10 +69,7 @@ public:
ObjectGuid GetOwnerGUID() const override { return *m_sceneObjectData->CreatedBy; }
uint32 GetFaction() const override { return 0; }
float GetStationaryX() const override { return _stationaryPosition.GetPositionX(); }
float GetStationaryY() const override { return _stationaryPosition.GetPositionY(); }
float GetStationaryZ() const override { return _stationaryPosition.GetPositionZ(); }
float GetStationaryO() const override { return _stationaryPosition.GetOrientation(); }
Position const& GetStationaryPosition() const override { return _stationaryPosition; }
void RelocateStationaryPosition(Position const& pos) { _stationaryPosition.Relocate(pos); }
void SetCreatedBySpellCast(ObjectGuid castId) { _createdBySpellCast = castId; }