aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Groups/Group.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-18 23:52:58 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-18 23:53:25 +0200
commitc5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a (patch)
treeaa7fde6f924fc39da54908bd6eeeb0be422e5fc3 /src/server/game/Groups/Group.cpp
parent74456703146194de72424ec98c4ea76402077be6 (diff)
Core/Game: Include cleanup
* Mostly aimed at removing Log/DatabaseEnv includes from other headers * Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files * Moved SAI function definitions to source files (massive or requiring many different dependencies)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
-rw-r--r--src/server/game/Groups/Group.cpp46
1 files changed, 26 insertions, 20 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 788feed0193..51e72590afa 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -16,30 +16,33 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "Common.h"
-#include "Opcodes.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
-#include "Player.h"
-#include "Pet.h"
-#include "World.h"
-#include "ObjectMgr.h"
-#include "GroupMgr.h"
#include "Group.h"
-#include "Formulas.h"
-#include "ObjectAccessor.h"
#include "Battleground.h"
#include "BattlegroundMgr.h"
-#include "MapManager.h"
+#include "Common.h"
+#include "DatabaseEnv.h"
+#include "Formulas.h"
+#include "GroupMgr.h"
#include "InstanceSaveMgr.h"
-#include "Util.h"
-#include "Random.h"
#include "LFGMgr.h"
-#include "UpdateFieldFlags.h"
-#include "SpellAuras.h"
-#include "PartyPackets.h"
+#include "Log.h"
+#include "LootMgr.h"
#include "LootPackets.h"
+#include "MapManager.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "Opcodes.h"
+#include "PartyPackets.h"
+#include "Pet.h"
+#include "Player.h"
+#include "Random.h"
+#include "SpellAuras.h"
#include "UpdateData.h"
+#include "UpdateFieldFlags.h"
+#include "Util.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
Roll::Roll(LootItem const& li) : itemid(li.itemid),
itemRandomPropId(li.randomPropertyId), itemRandomSuffix(li.randomSuffix), itemCount(li.count),
@@ -76,9 +79,12 @@ Group::~Group()
if (m_bgGroup)
{
TC_LOG_DEBUG("bg.battleground", "Group::~Group: battleground group being deleted.");
- if (m_bgGroup->GetBgRaid(ALLIANCE) == this) m_bgGroup->SetBgRaid(ALLIANCE, NULL);
- else if (m_bgGroup->GetBgRaid(HORDE) == this) m_bgGroup->SetBgRaid(HORDE, NULL);
- else TC_LOG_ERROR("misc", "Group::~Group: battleground group is not linked to the correct battleground.");
+ if (m_bgGroup->GetBgRaid(ALLIANCE) == this)
+ m_bgGroup->SetBgRaid(ALLIANCE, NULL);
+ else if (m_bgGroup->GetBgRaid(HORDE) == this)
+ m_bgGroup->SetBgRaid(HORDE, NULL);
+ else
+ TC_LOG_ERROR("misc", "Group::~Group: battleground group is not linked to the correct battleground.");
}
Rolls::iterator itr;
while (!RollId.empty())