From c76d96edfb27cfd76c52a6e3b4d072b0b5826957 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 22 May 2023 10:40:57 +0200 Subject: Core/Objects: Fixed uninitialized variables in FindCreatureOptions --- src/server/game/Entities/Object/Object.cpp | 3 +++ src/server/game/Entities/Object/Object.h | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index da4362b8bab..9415cf091e4 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -863,6 +863,9 @@ 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 8f5e27fdf70..844027a4d1f 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -434,7 +434,8 @@ class FlaggedValuesArray32 struct FindCreatureOptions { - FindCreatureOptions() = default; + FindCreatureOptions(); + ~FindCreatureOptions(); FindCreatureOptions& SetCreatureId(uint32 creatureId) { CreatureId = creatureId; return *this; } FindCreatureOptions& SetStringId(std::string_view stringId) { StringId = stringId; return *this; } @@ -461,9 +462,9 @@ struct FindCreatureOptions Optional IsInCombat; Optional IsSummon; - bool IgnorePhases; - bool IgnoreNotOwnedPrivateObjects; - bool IgnorePrivateObjects; + bool IgnorePhases = false; + bool IgnoreNotOwnedPrivateObjects = true; + bool IgnorePrivateObjects = false; Optional AuraSpellId; Optional OwnerGuid; -- cgit v1.2.3