aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBernd Lörwald <bloerwald@googlemail.com>2014-11-08 20:47:20 +0000
committerDDuarte <dnpd.dd@gmail.com>2014-11-08 20:47:20 +0000
commitfbfb29488859349c9f08e8500ccd194ca58757a7 (patch)
tree6049d1edfb13fa4a3a05647f71d14664322031ca /src
parentf80e9436622696f91a10b6f0b8ac6b283c8bf0b7 (diff)
Core: Fix non-pch build
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Server/Packets/GuildPackets.cpp1
-rw-r--r--src/server/game/Server/Packets/GuildPackets.h3
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp1
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp2
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/stonecore.cpp2
5 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp
index ee864b256bb..b94fb7839bf 100644
--- a/src/server/game/Server/Packets/GuildPackets.cpp
+++ b/src/server/game/Server/Packets/GuildPackets.cpp
@@ -16,7 +16,6 @@
*/
#include "GuildPackets.h"
-#include "ObjectGuid.h"
WorldPackets::Guild::QueryGuildInfo::QueryGuildInfo(WorldPacket&& packet)
: ClientPacket(std::move(packet))
diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h
index 17159a017e0..479ceba6280 100644
--- a/src/server/game/Server/Packets/GuildPackets.h
+++ b/src/server/game/Server/Packets/GuildPackets.h
@@ -19,8 +19,7 @@
#define GuildPackets_h__
#include "Packet.h"
-
-class ObjectGuid;
+#include "ObjectGuid.h"
namespace WorldPackets
{
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index fc14bf7a703..477d3baf206 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -18,6 +18,7 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
+#include "Player.h"
#include "Vehicle.h"
#include "stonecore.h"
diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
index 8cb4df0622f..ca5e40ab117 100644
--- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
@@ -125,7 +125,7 @@ class instance_stonecore : public InstanceMapScript
{
for (int8 i = 0; i < MAX_STONECORE_TELEPORTERS; i++)
{
- if (Creature* teleporter = GetCreature(stonecoreTeleporterGUID[i]))
+ if (Creature* teleporter = instance->GetCreature(stonecoreTeleporterGUID[i]))
{
teleporter->CastSpell(teleporter, SPELL_TELEPORTER_ACTIVE_VISUAL, true);
teleporter->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
index 2612cd02385..4ed84732eff 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
@@ -19,6 +19,8 @@
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "Player.h"
#include "stonecore.h"
enum Texts