diff options
| author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
| commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
| tree | a344f369ca32945f787a02dee35c3dbe342bed7e /src/game/OutdoorPvPMgr.cpp | |
| parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) | |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'src/game/OutdoorPvPMgr.cpp')
| -rw-r--r-- | src/game/OutdoorPvPMgr.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 8a59b438d5b..9ccce15ca2d 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -15,7 +15,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "OutdoorPvPMgr.h" #include "OutdoorPvPHP.h" #include "OutdoorPvPNA.h" @@ -26,15 +25,12 @@ #include "Wintergrasp.h" #include "Player.h" #include "Policies/SingletonImp.h" - INSTANTIATE_SINGLETON_1( OutdoorPvPMgr ); - OutdoorPvPMgr::OutdoorPvPMgr() { m_UpdateTimer = 0; //sLog.outDebug("Instantiating OutdoorPvPMgr"); } - OutdoorPvPMgr::~OutdoorPvPMgr() { //sLog.outDebug("Deleting OutdoorPvPMgr"); @@ -43,7 +39,6 @@ OutdoorPvPMgr::~OutdoorPvPMgr() (*itr)->DeleteSpawns(); } } - void OutdoorPvPMgr::InitOutdoorPvP() { // create new opvp @@ -60,7 +55,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() sLog.outDebug("OutdoorPvP : HP successfully initiated."); } - pOP = new OutdoorPvPNA; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -74,7 +68,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() sLog.outDebug("OutdoorPvP : NA successfully initiated."); } - pOP = new OutdoorPvPTF; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -87,7 +80,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() m_OutdoorPvPSet.push_back(pOP); sLog.outDebug("OutdoorPvP : TF successfully initiated."); } - pOP = new OutdoorPvPZM; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -100,7 +92,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() m_OutdoorPvPSet.push_back(pOP); sLog.outDebug("OutdoorPvP : ZM successfully initiated."); } - pOP = new OutdoorPvPSI; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -113,7 +104,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() m_OutdoorPvPSet.push_back(pOP); sLog.outDebug("OutdoorPvP : SI successfully initiated."); } - pOP = new OutdoorPvPEP; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -126,7 +116,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() m_OutdoorPvPSet.push_back(pOP); sLog.outDebug("OutdoorPvP : EP successfully initiated."); } - pOP = new OPvPWintergrasp; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -140,40 +129,32 @@ void OutdoorPvPMgr::InitOutdoorPvP() sLog.outDebug("OutdoorPvP : Wintergrasp successfully initiated."); } } - void OutdoorPvPMgr::AddZone(uint32 zoneid, OutdoorPvP *handle) { m_OutdoorPvPMap[zoneid] = handle; } - void OutdoorPvPMgr::HandlePlayerEnterZone(Player *plr, uint32 zoneid) { OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid); if(itr == m_OutdoorPvPMap.end()) return; - if(itr->second->HasPlayer(plr)) return; - itr->second->HandlePlayerEnterZone(plr, zoneid); sLog.outDebug("Player %u entered outdoorpvp id %u", plr->GetGUIDLow(), itr->second->GetTypeId()); } - void OutdoorPvPMgr::HandlePlayerLeaveZone(Player *plr, uint32 zoneid) { OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid); if(itr == m_OutdoorPvPMap.end()) return; - // teleport: remove once in removefromworld, once in updatezone if(!itr->second->HasPlayer(plr)) return; - itr->second->HandlePlayerLeaveZone(plr, zoneid); sLog.outDebug("Player %u left outdoorpvp id %u",plr->GetGUIDLow(), itr->second->GetTypeId()); } - OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid) { OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid); @@ -184,7 +165,6 @@ OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid) } return itr->second; } - void OutdoorPvPMgr::Update(uint32 diff) { m_UpdateTimer += diff; @@ -195,7 +175,6 @@ void OutdoorPvPMgr::Update(uint32 diff) m_UpdateTimer = 0; } } - bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) @@ -205,7 +184,6 @@ bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * } return false; } - ZoneScript * OutdoorPvPMgr::GetZoneScript(uint32 zoneId) { OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneId); @@ -214,7 +192,6 @@ ZoneScript * OutdoorPvPMgr::GetZoneScript(uint32 zoneId) else return NULL; } - bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) @@ -224,7 +201,6 @@ bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid) } return false; } - void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) @@ -233,7 +209,6 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid return; } } - bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) @@ -243,7 +218,6 @@ bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso) } return false; } - void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) |
