From 5b9868f468e48bb4dbcbffeb999b0a9315bc0364 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 2 Sep 2009 14:52:52 -0500
Subject: *Combine gobject::deleteobjectwithowner and delete

--HG--
branch : trunk
---
 src/game/GameObject.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 10ed4af509e..cc0d7f17fb7 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -489,17 +489,13 @@ void GameObject::AddUniqueUse(Player* player)
     m_unique_users.insert(player->GetGUIDLow());
 }
 
-void GameObject::DeleteObjectWithOwner()
+void GameObject::Delete()
 {
     SetLootState(GO_NOT_READY);
     if (GetOwnerGUID())
         if (Unit * owner = GetOwner(false))
             owner->RemoveGameObject(this, false);
-    Delete();
-}
 
-void GameObject::Delete()
-{
     assert (!GetOwnerGUID());
     SendObjectDeSpawnAnim(GetGUID());
 
-- 
cgit v1.2.3