Warning fixes + compile fix after the merge

This commit is contained in:
Spp committed 2012-07-30 10:07:26 +02:00
1 parent b460c496e2
commit 5a99dfad14
7 files changed
+14

No files matched your search

@@ -27,6 +27,7 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "zulaman.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
enum eEnums
{
@@ -27,6 +27,7 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "zulaman.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
//Trash Waves
float NalorakkWay[8][3] =
@@ -1336,6 +1336,7 @@ class npc_dark_nucleus : public CreatureScript
{
_targetAuraCheck = 1000;
if (Unit* victim = me->getVictim())
{
if (me->GetDistance(victim) < 15.0f &&
!victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID()))
{
@@ -1344,6 +1345,7 @@ class npc_dark_nucleus : public CreatureScript
}
else
MoveInLineOfSight(me->getVictim());
}
}
else
_targetAuraCheck -= diff;
@@ -25,6 +25,7 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
// 45102 Romantic Picnic
enum SpellsPicnic