*Combine gobject::deleteobjectwithowner and delete

--HG--
branch : trunk

1 files changed, 1 insertions, 5 deletions

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());