From 1acaed2af4690d488365d9969d2c360bd8e7f233 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 29 Jul 2023 23:46:31 +0200 Subject: Core/Objects: Switch to using designated initializers instead of chaining functions for FindCreatureOptions --- src/server/game/Entities/Object/Object.cpp | 3 --- src/server/game/Entities/Object/Object.h | 29 +---------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 748213b71e7..461b372cdcb 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -863,9 +863,6 @@ void MovementInfo::OutDebug() TC_LOG_DEBUG("misc", "standingOnGameObjectGUID: {}", standingOnGameObjectGUID->ToString()); } -FindCreatureOptions::FindCreatureOptions() = default; -FindCreatureOptions::~FindCreatureOptions() = default; - WorldObject::WorldObject(bool isWorldObject) : Object(), WorldLocation(), LastUsedScriptID(0), m_movementInfo(), m_name(), m_isActive(false), m_isFarVisible(false), m_isWorldObject(isWorldObject), m_zoneScript(nullptr), m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_outdoors(false), m_liquidStatus(LIQUID_MAP_NO_WATER), diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 58df910745c..e6025514676 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -432,29 +432,8 @@ class FlaggedValuesArray32 T_FLAGS m_flags; }; -struct TC_GAME_API FindCreatureOptions +struct FindCreatureOptions { - FindCreatureOptions(); - ~FindCreatureOptions(); - - FindCreatureOptions& SetCreatureId(uint32 creatureId) { CreatureId = creatureId; return *this; } - FindCreatureOptions& SetStringId(std::string_view stringId) { StringId = stringId; return *this; } - - FindCreatureOptions& SetIsAlive(bool isAlive) { IsAlive = isAlive; return *this; } - FindCreatureOptions& SetIsInCombat(bool isInCombat) { IsInCombat = isInCombat; return *this; } - FindCreatureOptions& SetIsSummon(bool isSummon) { IsSummon = isSummon; return *this; } - - FindCreatureOptions& SetIgnorePhases(bool ignorePhases) { IgnorePhases = ignorePhases; return *this; } - FindCreatureOptions& SetIgnoreNotOwnedPrivateObjects(bool ignoreNotOwnedPrivateObjects) { IgnoreNotOwnedPrivateObjects = ignoreNotOwnedPrivateObjects; return *this; } - FindCreatureOptions& SetIgnorePrivateObjects(bool ignorePrivateObjects) { IgnorePrivateObjects = ignorePrivateObjects; return *this; } - - FindCreatureOptions& SetHasAura(uint32 spellId) { AuraSpellId = spellId; return *this; } - FindCreatureOptions& SetOwner(ObjectGuid ownerGuid) { OwnerGuid = ownerGuid; return *this; } - FindCreatureOptions& SetCharmer(ObjectGuid charmerGuid) { CharmerGuid = charmerGuid; return *this; } - FindCreatureOptions& SetCreator(ObjectGuid creatorGuid) { CreatorGuid = creatorGuid; return *this; } - FindCreatureOptions& SetDemonCreator(ObjectGuid demonCreatorGuid) { DemonCreatorGuid = demonCreatorGuid; return *this; } - FindCreatureOptions& SetPrivateObjectOwner(ObjectGuid privateObjectOwnerGuid) { PrivateObjectOwnerGuid = privateObjectOwnerGuid; return *this; } - Optional CreatureId; Optional StringId; @@ -472,12 +451,6 @@ struct TC_GAME_API FindCreatureOptions Optional CreatorGuid; Optional DemonCreatorGuid; Optional PrivateObjectOwnerGuid; - - FindCreatureOptions(FindCreatureOptions const&) = delete; - FindCreatureOptions(FindCreatureOptions&&) = delete; - - FindCreatureOptions& operator=(FindCreatureOptions const&) = delete; - FindCreatureOptions& operator=(FindCreatureOptions&&) = delete; }; class TC_GAME_API WorldObject : public Object, public WorldLocation -- cgit v1.2.3