Merge MaNGOS, Gossip System. Autor NoFantasy.

* DB support required
* Closes #859

--HG--
branch : trunk

1 files changed, 0 insertions, 77 deletions

diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp
index 44b81dd6719..2aa79e4d2b2 100644
--- a/src/game/OutdoorPvPEP.cpp
+++ b/src/game/OutdoorPvPEP.cpp
@@ -616,84 +616,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
         m_FlightMasterSpawned = team;
         DelCreature(EP_PWT_FLIGHTMASTER);
         AddCreature(EP_PWT_FLIGHTMASTER,EP_PWT_FlightMaster.entry,team,EP_PWT_FlightMaster.map,EP_PWT_FlightMaster.x,EP_PWT_FlightMaster.y,EP_PWT_FlightMaster.z,EP_PWT_FlightMaster.o);
-        Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]);
-        if(c)
-        {
-            GossipOption gso;
-            gso.Action = GOSSIP_OPTION_OUTDOORPVP;
-            gso.GossipId = 0;
-            gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_NPT));
-            gso.Id = 50;
-            gso.Icon = 0;
-            gso.NpcFlag = 0;
-            c->addGossipOption(gso);
-
-            gso.Action = GOSSIP_OPTION_OUTDOORPVP;
-            gso.GossipId = 0;
-            gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT));
-            gso.Id = 50;
-            gso.Icon = 0;
-            gso.NpcFlag = 0;
-            c->addGossipOption(gso);
-
-            gso.Action = GOSSIP_OPTION_OUTDOORPVP;
-            gso.GossipId = 0;
-            gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT));
-            gso.Id = 50;
-            gso.Icon = 0;
-            gso.NpcFlag = 0;
-            c->addGossipOption(gso);
-        }
-    }
-}
-
-bool OPvPCapturePointEP_PWT::CanTalkTo(Player * p, Creature * c, GossipOption &gso)
-{
-    if( p->GetTeam() == m_FlightMasterSpawned &&
-        c->GetGUID() == m_Creatures[EP_PWT_FLIGHTMASTER] &&
-        gso.Id == 50 )
-        return true;
-    return false;
-}
-
-bool OPvPCapturePointEP_PWT::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid)
-{
-    std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
-    if(itr != m_CreatureTypes.end())
-    {
-        Creature * cr = HashMapHolder<Creature>::Find(guid);
-        if(!cr)
-            return true;
-        if(itr->second == EP_PWT_FLIGHTMASTER)
-        {
-            uint32 src = EP_PWT_Taxi;
-            uint32 dst = 0;
-            switch(gossipid)
-            {
-            case 0:
-                dst = EP_NPT_Taxi;
-                break;
-            case 1:
-                dst = EP_EWT_Taxi;
-                break;
-            default:
-                dst = EP_CGT_Taxi;
-                break;
-            }
-
-            std::vector<uint32> nodes;
-            nodes.resize(2);
-            nodes[0] = src;
-            nodes[1] = dst;
-
-            plr->PlayerTalkClass->CloseGossip();
-            plr->ActivateTaxiPathTo(nodes, cr);
-            // leave the opvp, seems like moveinlineofsight isn't called when entering a taxi
-            HandlePlayerLeave(plr);
-        }
-        return true;
     }
-    return false;
 }
 
 // ep