*Combine gobject::deleteobjectwithowner and delete

--HG--
branch : trunk

src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp

@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
             if (Player* pPlayer = Unit::GetPlayer(itr->first))
                 pPlayer->RemoveAura(SPELL_ICEBOLT);
             if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
-                pGo->DeleteObjectWithOwner();
+                pGo->Delete();
         }
         iceblocks.clear();
     }

src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp

@@ -200,7 +200,7 @@ bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* pGo)
             if (CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine())
             {
                 pPlayer->CastSpell(pPlayer, SPELL_CREATE_NAJENTUS_SPINE, true);
-                pGo->DeleteObjectWithOwner();
+                pGo->Delete();
             }
     return true;
 }

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

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