diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-10-06 16:55:01 +0100 | 
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-10-06 16:55:01 +0100 | 
| commit | d27a3955f05427762f1d3bce71b07b682bfc36b1 (patch) | |
| tree | 47e8b31f3a8360964d15255a28a950db609fc0fd /src/server/scripts | |
| parent | 6497bea6010805bce2aa3b6abc532036e11e3fef (diff) | |
Core/Misc: Tabs to spaces and whitespace cleanup
Diffstat (limited to 'src/server/scripts')
5 files changed, 31 insertions, 31 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index ebab2cb99a9..b34a990d39d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -44,7 +44,7 @@ enum event  {      EVENT_SPAWN = 1,      EVENT_MINI, -    EVENT_ROOT,   +    EVENT_ROOT,      EVENT_BASH,      EVENT_BOLT,      EVENT_AURA @@ -58,13 +58,13 @@ public:      struct boss_amanitarAI : public BossAI      {          boss_amanitarAI(Creature* creature) : BossAI(creature, DATA_AMANITAR) { } -         +          void Reset()          {              _Reset(); -             +              me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); -            me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);             +            me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);              summons.DespawnAll();              if (instance) @@ -119,7 +119,7 @@ public:                      {                          trigger->DisappearAndDie();                      } -                    else   +                    else                      {                          u = 1 - u;                          trigger->DisappearAndDie(); @@ -143,7 +143,7 @@ public:              {                  switch (eventId)                  { -                    case EVENT_SPAWN:   +                    case EVENT_SPAWN:                          SpawnAdds();                          events.ScheduleEvent(EVENT_SPAWN, 20*IN_MILLISECONDS);                          break; @@ -151,7 +151,7 @@ public:                          DoCast(SPELL_MINI);                          events.ScheduleEvent(EVENT_MINI, urand(25,30)*IN_MILLISECONDS);                          break; -                    case EVENT_ROOT:                 +                    case EVENT_ROOT:                          DoCast(SelectTarget(SELECT_TARGET_RANDOM,0, 100, true),SPELL_ENTANGLING_ROOTS,true);                          events.ScheduleEvent(EVENT_ROOT, urand(10,15)*IN_MILLISECONDS);                          break; @@ -192,7 +192,7 @@ public:          {              events.Reset();              events.ScheduleEvent(EVENT_AURA, 1*IN_MILLISECONDS); -             +              me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);              DoCast(SPELL_PUTRID_MUSHROOM); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 2bc5bc2cca6..ef4a7ef0f75 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -77,7 +77,7 @@ class boss_elder_nadox : public CreatureScript              void Reset()              {                  events.Reset(); -                summons.DespawnAll();                 +                summons.DespawnAll();                  AmountHealthModifier = 1;                  GuardianDied = false; @@ -133,7 +133,7 @@ class boss_elder_nadox : public CreatureScript                  Talk(SAY_DEATH);                  summons.DespawnAll(); -                 +                  if (instance)                      instance->SetData(DATA_ELDER_NADOX_EVENT, DONE);              } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 8e7863259ad..179dedb290b 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -105,8 +105,8 @@ public:          void Reset()          {              me->CastSpell(me, SPELL_EVOCATE); -			 -			_Reset(); + +            _Reset();              if (instance->GetData(DATA_UROM_PLATAFORM) == 0)              { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 1f4a3d1b229..a0b5aded315 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -278,7 +278,7 @@ public:                  eternos->GetMotionMaster()->MovePoint(0, 943.202f, 1059.35f, 359.967f);              if (Creature* verdisa = instance->GetCreature(verdisaGUID))                  verdisa->SetWalk(true), -                verdisa->GetMotionMaster()->MovePoint(0, 949.188f, 1032.91f, 359.967f);  +                verdisa->GetMotionMaster()->MovePoint(0, 949.188f, 1032.91f, 359.967f);          }          void GreaterWhelps() diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index f2fa3158603..39fff139b52 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -108,10 +108,10 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript  {  public:      npc_verdisa_beglaristrasz_eternos() : CreatureScript("npc_verdisa_beglaristrasz_eternos") { } -     -	    InstanceScript* instance; -     -	bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + +        InstanceScript* instance; + +    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)      {          player->PlayerTalkClass->ClearMenus();          switch (creature->GetEntry()) @@ -245,7 +245,7 @@ public:                  me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);          }      }; -         +      CreatureAI* GetAI(Creature* creature) const      {          return new npc_verdisa_beglaristrasz_eternosAI(creature); @@ -293,7 +293,7 @@ public:          {              instance = creature->GetInstanceScript();          } -      +              InstanceScript* instance;              uint64 summonerGUID; @@ -324,9 +324,9 @@ public:              HealthWarningOff = false;              DisableTakeOff = false;          } -             +          void IsSummonedBy(Unit* summoner) -        {    +        {              if (instance->GetBossState(DATA_EREGOS_EVENT) == IN_PROGRESS)                  if (Creature* eregos = me->FindNearestCreature(NPC_EREGOS, 450.0f, true))                  { @@ -357,7 +357,7 @@ public:          void UpdateAI(const uint32 diff)          {              if (!(instance->GetBossState(DATA_VAROS_EVENT) == DONE)) -            {    +            {                  if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE))                  {                      if (!(WelcomeOff)) @@ -380,7 +380,7 @@ public:                      {                          Talk(WHISPER_DRAKES_ABILITIES, me->GetCreatorGUID());                          WelcomeSequelOff = false; -                    }    +                    }                      else WelcomeSequelTimer -= diff;                  }              } @@ -391,10 +391,10 @@ public:                      if (!(SpecialOff))                      {                          if (SpecialTimer <= diff) -                        {  +                        {                              Talk(WHISPER_DRAKES_SPECIAL, me->GetCreatorGUID());                              SpecialOff = true; -                        }    +                        }                          else SpecialTimer -= diff;                      }                  } @@ -402,25 +402,25 @@ public:              if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE))              {                  if (!(HealthWarningOff)) -                {   +                {                      if (me->GetHealthPct() <= 40.0f)                      {                          Talk(WHISPER_DRAKES_LOWHEALTH, me->GetCreatorGUID());                          HealthWarningOff = true;                      }                  } -            }  +            }              if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) -            {     +            {                  if (HealthWarningOff) -                {  +                {                      if (WarningTimer <= diff)                      {                          HealthWarningOff = false;                          WarningTimer = 25000;                      }                      else WarningTimer -= diff; -                }  +                }              }              if (!(me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)))              { @@ -433,7 +433,7 @@ public:                          me->SetSpeed(MOVE_FLIGHT, 1.0f, true);                          Talk(SAY_DRAKES_TAKEOFF);                          Position pos; -                        me->GetPosition(&pos);  +                        me->GetPosition(&pos);                          pos.m_positionX += 10.0f;                          pos.m_positionY += 10.0f;                          pos.m_positionZ += 12.0f;  | 
