From f93830e0ae96be348638c51918df754ee408e16d Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Mon, 3 Aug 2009 14:52:30 +0200
Subject: *Add DeleteObjectWith owner function for gameobject deletion with
 updating owner object list *Cleanups in Aura 1852 and recenlty added glyph
 code.

--HG--
branch : trunk
---
 src/game/GameObject.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/game/GameObject.cpp')

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index f934d3d1fe7..457591e63b4 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -434,7 +434,7 @@ void GameObject::Update(uint32 /*p_time*/)
 
             if(GetOwnerGUID())
             {
-                if(Unit* owner = GetOwner())
+                if(Unit* owner = GetOwner(false))
                 {
                     owner->RemoveGameObject(this, false);
                     SetRespawnTime(0);
@@ -492,6 +492,15 @@ void GameObject::AddUniqueUse(Player* player)
     m_unique_users.insert(player->GetGUIDLow());
 }
 
+void GameObject::DeleteObjectWithOwner()
+{
+    SetLootState(GO_NOT_READY);
+    if (GetOwnerGUID())
+        if (Unit * owner = GetOwner(false))
+            owner->RemoveGameObject(this, false);
+    Delete();
+}
+
 void GameObject::Delete()
 {
     assert (!GetOwnerGUID());
-- 
cgit v1.2.3