aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Pet
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-08-09 19:59:52 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-08-09 20:00:18 +0200
commit8aff3945f275b2285413ffadef616da1eb513faa (patch)
treef4904f673b29e1526ef25461075ae92417cad256 /src/server/scripts/Pet
parent8c7db6cc8d0f979fd808c9fde36a646eb413e653 (diff)
Scripted: Fix non pch build
Diffstat (limited to 'src/server/scripts/Pet')
-rw-r--r--src/server/scripts/Pet/pet_dk.cpp4
-rw-r--r--src/server/scripts/Pet/pet_hunter.cpp2
-rw-r--r--src/server/scripts/Pet/pet_mage.cpp2
-rw-r--r--src/server/scripts/Pet/pet_priest.cpp1
-rw-r--r--src/server/scripts/Pet/pet_shaman.cpp4
5 files changed, 11 insertions, 2 deletions
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 7a3776fb0b5..aac2eb0f89e 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -22,13 +22,15 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "CombatAI.h"
+#include "GridNotifiers.h"
enum DeathKnightSpells
{
SPELL_DK_SUMMON_GARGOYLE_1 = 49206,
SPELL_DK_SUMMON_GARGOYLE_2 = 50514,
SPELL_DK_DISMISS_GARGOYLE = 50515,
- SPELL_DK_SANCTUARY = 54661,
+ SPELL_DK_SANCTUARY = 54661
};
class npc_pet_dk_ebon_gargoyle : public CreatureScript
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 90281654710..80551be9131 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -101,7 +101,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript
if (_spellTimer <= diff)
{
- if (_isViper) //Viper
+ if (_isViper) // Viper
{
if (urand(0, 2) == 0) //33% chance to cast
{
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index 479cbc69ada..85247b29f84 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -22,6 +22,8 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "CombatAI.h"
+#include "Pet.h"
enum MageSpells
{
diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp
index fa273de1870..4b565aaec10 100644
--- a/src/server/scripts/Pet/pet_priest.cpp
+++ b/src/server/scripts/Pet/pet_priest.cpp
@@ -22,6 +22,7 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "PassiveAI.h"
#include "PetAI.h"
enum PriestSpells
diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
index 63ce0d6b3e3..c770be86692 100644
--- a/src/server/scripts/Pet/pet_shaman.cpp
+++ b/src/server/scripts/Pet/pet_shaman.cpp
@@ -63,6 +63,8 @@ class npc_pet_shaman_earth_elemental : public CreatureScript
if (!UpdateVictim())
return;
+ events.Update(diff);
+
if (_events.ExecuteEvent() == EVENT_SHAMAN_ANGEREDEARTH)
{
DoCastVictim(SPELL_SHAMAN_ANGEREDEARTH);
@@ -108,6 +110,8 @@ class npc_pet_shaman_fire_elemental : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
+ events.Update(diff);
+
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)