From c5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Thu, 18 May 2017 23:52:58 +0200
Subject: 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)
---
 src/server/scripts/World/action_ip_logger.cpp |  1 +
 src/server/scripts/World/chat_log.cpp         |  1 +
 src/server/scripts/World/duel_reset.cpp       |  1 +
 src/server/scripts/World/go_scripts.cpp       |  5 +++--
 src/server/scripts/World/item_scripts.cpp     |  4 ++--
 src/server/scripts/World/npc_professions.cpp  |  5 +++--
 src/server/scripts/World/npcs_special.cpp     | 23 ++++++++++++-----------
 7 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'src/server/scripts/World')

diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp
index 4c828ce635c..8ab65038028 100644
--- a/src/server/scripts/World/action_ip_logger.cpp
+++ b/src/server/scripts/World/action_ip_logger.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "ScriptMgr.h"
+#include "DatabaseEnv.h"
 #include "Player.h"
 
 enum IPLoggingTypes
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index dc77fd0799d..7366b12e8ea 100644
--- a/src/server/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
@@ -19,6 +19,7 @@
 #include "Channel.h"
 #include "Guild.h"
 #include "Group.h"
+#include "Log.h"
 
 class ChatLogScript : public PlayerScript
 {
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index d792a1cb47f..ba746a498f3 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -19,6 +19,7 @@
 #include "Player.h"
 #include "Pet.h"
 #include "SpellInfo.h"
+#include "World.h"
 
 class DuelResetScript : public PlayerScript
 {
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index b1163a760e7..4f7015bd222 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -45,11 +45,12 @@ go_toy_train_set
 EndContentData */
 
 #include "ScriptMgr.h"
+#include "GameObjectAI.h"
+#include "Log.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
-#include "GameObjectAI.h"
 #include "Spell.h"
-#include "Player.h"
 #include "WorldSession.h"
 
 /*######
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 60a282f26de..05f9054ab48 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -159,7 +159,7 @@ public:
         ItemPosCountVec dest;
         uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
         if (msg == EQUIP_ERR_OK)
-            player->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
+            player->StoreNewItem(dest, 39883, true, GenerateItemRandomPropertyId(39883));
 
         return true;
     }
@@ -179,7 +179,7 @@ public:
         ItemPosCountVec dest;
         uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
         if (msg == EQUIP_ERR_OK)
-            player->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
+            player->StoreNewItem(dest, 44718, true, GenerateItemRandomPropertyId(44718));
 
         return true;
     }
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index f9b25732270..57fd0e34176 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -24,9 +24,10 @@ SDCategory: NPCs
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "Log.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
-#include "Player.h"
 #include "SpellInfo.h"
 #include "WorldSession.h"
 
@@ -1224,7 +1225,7 @@ enum MultiProfessionTrainer
     GOSSIP_OPTION_SKINNING       = 9,
     GOSSIP_OPTION_TAILORING      = 10,
     GOSSIP_OPTION_MULTI          = 11,
- 
+
     GOSSIP_MENU_HERBALISM        = 12188,
     GOSSIP_MENU_MINING           = 12189,
     GOSSIP_MENU_SKINNING         = 12190,
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index c568929c28f..9987168141c 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -17,23 +17,24 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
-#include "ScriptedEscortAI.h"
-#include "ObjectMgr.h"
-#include "ScriptMgr.h"
-#include "World.h"
-#include "PassiveAI.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "CreatureTextMgr.h"
 #include "GameEventMgr.h"
 #include "GameObjectAI.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
-#include "Cell.h"
-#include "CellImpl.h"
-#include "SpellAuras.h"
+#include "Log.h"
+#include "ObjectMgr.h"
+#include "PassiveAI.h"
 #include "Pet.h"
-#include "CreatureTextMgr.h"
+#include "ScriptedCreature.h"
+#include "ScriptedEscortAI.h"
+#include "ScriptedGossip.h"
+#include "ScriptMgr.h"
+#include "SpellAuras.h"
 #include "SpellHistory.h"
+#include "World.h"
 
 /*########
 # npc_air_force_bots
-- 
cgit v1.2.3