aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-02-20 17:39:31 +0100
committerShauren <shauren.trinity@gmail.com>2017-02-20 17:39:31 +0100
commit3fce636c19a1de1955b5a8e8518f724060a68309 (patch)
tree1242dfbaaafde66b49a4ad86e72c0ab361cb82b5
parentdd3dd5991d94de67fcb8fae36e857ce0fe045791 (diff)
Revert "Fix non-PCH build." and fix it the proper way
This reverts commit 438d090c8db0ede966093f8bc9cf7f1e63b4b65e.
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedGossip.cpp3
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedGossip.h9
2 files changed, 8 insertions, 4 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
index a55e96da9c4..cbf4993ae75 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
@@ -16,8 +16,9 @@
*/
#include "ScriptedGossip.h"
-#include "Player.h"
#include "Creature.h"
+#include "GossipDef.h"
+#include "Player.h"
void ClearGossipMenuFor(Player* player) { player->PlayerTalkClass->ClearMenus(); }
// Using provided text, not from DB
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
index dd54020e07e..7ab27d8181f 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
@@ -19,9 +19,12 @@
#ifndef SC_GOSSIP_H
#define SC_GOSSIP_H
-#include "GossipDef.h"
-#include "QuestDef.h"
-#include "Creature.h"
+#include "Define.h"
+#include <string>
+
+class Creature;
+class ObjectGuid;
+class Player;
// Gossip Item Text
#define GOSSIP_TEXT_BROWSE_GOODS "I'd like to browse your goods."