Add missing GetWeakPtr functions (#1)

cmangos · Aug 16, 2024 · b96ace5 · b96ace5
1 parent 219c347
commit b96ace5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/src/game/Entities/Object.h b/src/game/Entities/Object.h
@@ -628,6 +628,8 @@ class Object
         inline bool IsGameObject() const { return GetTypeId() == TYPEID_GAMEOBJECT; }
         inline bool IsCorpse() const { return GetTypeId() == TYPEID_CORPSE; }
 
+        MaNGOS::unique_weak_ptr<Object> GetWeakPtr() const { return m_scriptRef; }
+
     protected:
         Object();
 

diff --git a/src/game/Entities/Vehicle.cpp b/src/game/Entities/Vehicle.cpp
@@ -960,4 +960,10 @@ void VehicleInfo::RemoveSeatMods(Unit* passenger, uint32 seatFlags)
     }
 }
 
+MaNGOS::unique_weak_ptr<VehicleInfo> VehicleInfo::GetWeakPtr() const
+{
+    Unit* pVehicle = (Unit*)m_owner;
+    return pVehicle->GetVehicleInfoWeakPtr();
+}
+
 /*! @} */
diff --git a/src/game/Entities/Vehicle.h b/src/game/Entities/Vehicle.h
@@ -107,6 +107,8 @@ class VehicleInfo : public TransportBase
         void RespawnAccessories(int32 seatIndex = -1);
         void RecallAccessories(float distance = 0.f, int32 seatIndex = -1);
 
+        MaNGOS::unique_weak_ptr<VehicleInfo> GetWeakPtr() const;
+
     private:
         // Internal use to calculate the boarding position
         void CalculateBoardingPositionOf(float gx, float gy, float gz, float go, float& lx, float& ly, float& lz, float& lo) const;

diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp
@@ -9980,3 +9980,7 @@ SpellCastResult Spell::CheckVehicle(Unit const* caster, SpellEntry const& spellI
     return SPELL_CAST_OK;
 }
 
+MaNGOS::unique_weak_ptr<Spell> Spell::GetWeakPtr() const
+{
+    return m_spellEvent->GetSpellWeakPtr();
+}
diff --git a/src/game/Spells/Spell.h b/src/game/Spells/Spell.h
@@ -329,7 +329,9 @@ class SpellEvent : public BasicEvent
         virtual bool IsDeletable() const override;
 
         Spell* GetSpell() const { return m_Spell.get(); }
-        protected:
+        MaNGOS::unique_weak_ptr<Spell> GetSpellWeakPtr() const { return m_Spell; }
+
+    protected:
         MaNGOS::unique_trackable_ptr<Spell> m_Spell;
 };
 
@@ -903,6 +905,9 @@ class Spell
         void SetDamageDoneModifier(float mod, SpellEffectIndex effIdx);
         void SetIgnoreOwnerLevel(bool state) { m_ignoreOwnerLevel = state; }
         void SetUsableWhileStunned(bool state) { m_usableWhileStunned = state; }
+
+        MaNGOS::unique_weak_ptr<Spell> GetWeakPtr() const;
+
     protected:
         void SendLoot(ObjectGuid guid, LootType loottype, LockType lockType);
         bool IgnoreItemRequirements() const;                // some item use spells have unexpected reagent data