*Combine gobject::deleteobjectwithowner and delete

--HG--
branch : trunk

2 files changed, 1 insertions, 6 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());
 
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index 20bead449bc..358eb0cbfb7 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -656,7 +656,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         uint32 GetRespawnDelay() const { return m_respawnDelayTime; }
         void Refresh();
         void Delete();
-        void DeleteObjectWithOwner();
         void getFishLoot(Loot *loot, Player* loot_owner);
         GameobjectTypes GetGoType() const { return GameobjectTypes(GetByteValue(GAMEOBJECT_BYTES_1, 1)); }
         void SetGoType(GameobjectTypes type) { SetByteValue(GAMEOBJECT_BYTES_1, 1, type); }