diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
| commit | 41822a8ed392357aed43e52135a51456b0a42f96 (patch) | |
| tree | a358f6b3a69d5f928c331e7ccf56849281a956e3 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | 455da45d9c476214e1d5567f79c9f029719330be (diff) | |
| parent | 69e81d46b16ab9172c0a0999e387a0fb7f0f939c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.h
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index daab9b79f21..a81fb5e093a 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -66,8 +66,6 @@ Battlefield::~Battlefield() for (GraveyardVect::const_iterator itr = m_GraveyardList.begin(); itr != m_GraveyardList.end(); ++itr) delete *itr; - - m_capturePoints.clear(); } // Called when a player enters the zone @@ -684,7 +682,6 @@ BfGraveyard::BfGraveyard(Battlefield* battlefield) m_ControlTeam = TEAM_NEUTRAL; m_SpiritGuide[0] = 0; m_SpiritGuide[1] = 0; - m_ResurrectQueue.clear(); } void BfGraveyard::Initialize(TeamId startControl, uint32 graveyardId) |