diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-18 19:51:28 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-18 19:51:28 +0200 |
| commit | f778c5e73992f02a035475812de96aba977ce9d4 (patch) | |
| tree | e1ec021813f6f41023d6e47817a7e2f5b4dd6632 /src/server/scripts | |
| parent | 7d778120554bd61c5cb33067d80150cb6500e3fc (diff) | |
Whitespace cleanups...
Diffstat (limited to 'src/server/scripts')
11 files changed, 32 insertions, 32 deletions
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 6a26cc0acc1..a85dfaa219d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 974930c944b..06d1c99d39f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -105,7 +105,7 @@ class boss_kurinnaxx : public CreatureScript break; } } - + DoMeleeAttackIfReady(); } private: diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index dac777bf260..8afdc29b76e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -32,7 +32,7 @@ enum Spells SPELL_SUMMON_MANA_FIEND_1 = 25681, // TARGET_DEST_CASTER_FRONT SPELL_SUMMON_MANA_FIEND_2 = 25682, // TARGET_DEST_CASTER_LEFT SPELL_SUMMON_MANA_FIEND_3 = 25683, // TARGET_DEST_CASTER_RIGHT - SPELL_ENERGIZE = 25685 + SPELL_ENERGIZE = 25685 }; enum Events @@ -167,7 +167,7 @@ class boss_moam : public CreatureScript break; } } - + DoMeleeAttackIfReady(); } private: diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index bad5553cb1e..a03733d0c35 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -112,7 +112,7 @@ class boss_rajaxx : public CreatureScript break; } } - + DoMeleeAttackIfReady(); } private: diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index f2e6f3657b0..58080d766f5 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -66,7 +66,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript { if (!InstanceScript::SetBossState(bossId, state)) return false; - + return true; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 79a864d02b1..4bf2a4499c5 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -190,7 +190,7 @@ class boss_baltharus_the_warborn : public CreatureScript break; case EVENT_CLEAVE: DoCastVictim(SPELL_CLEAVE); - events.ScheduleEvent(EVENT_CLEAVE, 24000, 0, PHASE_COMBAT); + events.ScheduleEvent(EVENT_CLEAVE, 24000, 0, PHASE_COMBAT); break; case EVENT_BLADE_TEMPEST: DoCast(me, SPELL_BLADE_TEMPEST); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 5819d543313..dc41dcaaf11 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #include "ScriptPCH.h" #include "ruby_sanctum.h" diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index bc050b120da..36689bd2d0e 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -91,7 +91,7 @@ enum AuriayaYells enum AuriayaActions { ACTION_CRAZY_CAT_LADY = 0, - ACTION_RESPAWN_DEFENDER + ACTION_RESPAWN_DEFENDER }; #define SENTRY_NUMBER RAID_MODE<uint8>(2, 4) @@ -122,7 +122,7 @@ class boss_auriaya : public CreatureScript { _EnterCombat(); DoScriptText(SAY_AGGRO,me); - + events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); events.ScheduleEvent(EVENT_BLAST, urand(20000, 25000)); events.ScheduleEvent(EVENT_TERRIFYING, urand(20000, 30000)); @@ -148,7 +148,7 @@ class boss_auriaya : public CreatureScript } if (summoned->GetEntry() == NPC_FERAL_DEFENDER) - { + { if (!summoned->isInCombat() && me->getVictim()) summoned->AI()->AttackStart(me->getVictim()); summoned->SetAuraStack(SPELL_FERAL_ESSENCE, summoned, 9); @@ -168,7 +168,7 @@ class boss_auriaya : public CreatureScript --defenderLifes; if (!defenderLifes) { - SetData(DATA_NINE_LIVES, 1); + SetData(DATA_NINE_LIVES, 1); break; } events.ScheduleEvent(EVENT_RESPAWN_DEFENDER, 30000); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index c4651612aed..434f3de2d6a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -293,7 +293,7 @@ class boss_general_vezax : public CreatureScript std::advance(itr, urand(0, size - 1)); return *itr; } - + return NULL; } }; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 350a44c1cd0..5e6cc295230 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -192,8 +192,8 @@ class npc_flash_freeze : public CreatureScript if (!UpdateVictim() || me->getVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->getVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; - if (me->getVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) - me->DespawnOrUnsummon(); + if (me->getVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) + me->DespawnOrUnsummon(); if (checkDespawnTimer <= diff) { @@ -644,10 +644,10 @@ class npc_hodir_priest : public CreatureScript } void JustDied(Unit* /*who*/) - { + { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); - } + } private: InstanceScript* instance; @@ -706,10 +706,10 @@ class npc_hodir_shaman : public CreatureScript } void JustDied(Unit* /*who*/) - { + { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); - } + } private: InstanceScript* instance; @@ -767,10 +767,10 @@ class npc_hodir_druid : public CreatureScript } void JustDied(Unit* /*who*/) - { + { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); - } + } private: InstanceScript* instance; @@ -847,10 +847,10 @@ class npc_hodir_mage : public CreatureScript } void JustDied(Unit* /*who*/) - { - if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) + { + if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); - } + } private: InstanceScript* instance; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index b7f2af822d4..2ce3d98a79b 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -198,7 +198,7 @@ class boss_xt002 : public CreatureScript uint32 transferHealth; bool enterHardMode; - + void Reset() { @@ -353,7 +353,7 @@ class boss_xt002 : public CreatureScript DoCast(SPELL_SUBMERGE); // WIll make creature untargetable me->AttackStop(); me->SetReactState(REACT_PASSIVE); - + Unit* heart = me->GetVehicleKit() ? me->GetVehicleKit()->GetPassenger(HEART_VEHICLE_SEAT) : NULL; if (heart) { @@ -364,7 +364,7 @@ class boss_xt002 : public CreatureScript //heart->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT | UNIT_FLAG_UNK_15 | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_UNK_29); heart->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - + } events.CancelEvent(EVENT_SEARING_LIGHT); @@ -451,7 +451,7 @@ public: { XT002->AI()->SetData(DATA_TRANSFERED_HEALTH, me->GetMaxHealth()); XT002->AI()->DoAction(ACTION_ENTER_HARD_MODE); - damage = 0; + damage = 0; } } }; @@ -570,14 +570,14 @@ public: DoCast(me->getVictim(), SPELL_TRAMPLE); uiTrampleTimer = TIMER_TRAMPLE; } - else + else uiTrampleTimer -= diff; if (uiUppercutTimer <= diff) { DoCast(me->getVictim(), SPELL_UPPERCUT); uiUppercutTimer = TIMER_UPPERCUT; - } + } else uiUppercutTimer -= diff; } @@ -607,7 +607,7 @@ class BoomEvent : public BasicEvent // then EFFECT_1, etc - instead of applying each effect on target1, then target2, etc. // The above situation causes the visual for this spell to be bugged, so we remove the instakill // effect and implement a script hack for that. - + _me->CastSpell(_me, SPELL_BOOM, false); return true; } @@ -708,7 +708,7 @@ public: struct mob_life_sparkAI : public ScriptedAI { mob_life_sparkAI(Creature* pCreature) : ScriptedAI(pCreature) - { + { m_pInstance = pCreature->GetInstanceScript(); } |
