diff options
| author | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
| commit | 137b079eea2c8bff3bfa33099c016502beeb868a (patch) | |
| tree | 876ce4404a299c6ed7cccf79fc04d8ad4b29b385 /src/server/scripts/EasternKingdoms | |
| parent | 57f85ab7da3c1759a0cef3bd0497253c54bf1218 (diff) | |
Core: Generic cleanup (tab2spaces/trailing whitespace removal)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
11 files changed, 31 insertions, 31 deletions
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index d10d5aa0461..796d7bcadfb 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -45,9 +45,9 @@ public: struct boss_baron_geddonAI : public ScriptedAI { - boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp index 9c38220bbfd..5cddc3348b9 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp @@ -47,9 +47,9 @@ public: struct boss_garrAI : public ScriptedAI { - boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp index af40d6c912a..70b379aa380 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp @@ -42,9 +42,9 @@ public: struct boss_gehennasAI : public ScriptedAI { - boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp index d3683176f96..ed6dc98a3b2 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp @@ -42,9 +42,9 @@ public: struct boss_lucifronAI : public ScriptedAI { - boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index d16dd730629..db48760c90f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -46,9 +46,9 @@ public: struct boss_magmadarAI : public ScriptedAI { - boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceScript(); + boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index 176a781c54c..91f1e8b3bab 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -79,24 +79,24 @@ public: } bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 /*uiAction*/) - { + { //ScriptedInstance* pInstance = pCreature->GetInstanceData(); BossAI* pBossAI = CAST_AI(boss_majordomoAI, pCreature->AI()); if (/*pInstance && */pBossAI) - { + { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent(); + CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent(); } - return true; + return true; } struct boss_majordomoAI : public BossAI { - boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO) + boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -137,7 +137,7 @@ public: return; if (((!me->FindNearestCreature(ENTRY_FLAMEWALKER_HEALER,100.0f)) && (!me->FindNearestCreature(ENTRY_FLAMEWALKER_ELITE,100.0f))) && (!m_pInstance->GetData(DATA_MAJORDOMOISDEAD))) - { + { me->setFaction(35); me->AI()->EnterEvadeMode(); DoScriptText(SAY_DEFEAT, me); @@ -174,8 +174,8 @@ public: if (Teleport_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_TELEPORT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + DoCast(pTarget, SPELL_TELEPORT); Teleport_Timer = 20000; } else Teleport_Timer -= diff; @@ -199,7 +199,7 @@ public: if (m_pInstance) m_pInstance->SetData(DATA_RAGNAROS, true); Phase = 4; - Phase_Timer = 16000; + Phase_Timer = 16000; } else Phase_Timer -= diff; } if (Phase == 4) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 28adb9d84ec..deacf74bf4d 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -381,7 +381,7 @@ public: Intro_Timer = 4000; Intro = 1; } - + } }; @@ -400,13 +400,13 @@ public: struct mob_SonOfFlameAI : public ScriptedAI //didnt work correctly in EAI for me... { - mob_SonOfFlameAI(Creature *c) : ScriptedAI(c) + mob_SonOfFlameAI(Creature *c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } InstanceScript* pInstance; - + void JustDied(Unit * /*victim*/) { if (pInstance) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp index 6a97a7a55eb..c460a9f52a1 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp @@ -45,7 +45,7 @@ public: { boss_shazzrahAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp index 427db5e3fe3..0f2c42bc46f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp @@ -49,9 +49,9 @@ public: struct boss_sulfuronAI : public ScriptedAI { - boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp index e9e5ec9abb8..fd81e3337f0 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp @@ -54,7 +54,7 @@ const Position Pos[10] = {722.408f,-1152.41f,-120.029f,5.33087f}, {718.994f,-1156.36f,-119.805f,5.75738f}, {838.51f,-829.84f,-232.00f,2.00f}, -}; +}; class instance_molten_core : public InstanceMapScript { @@ -313,7 +313,7 @@ public: if (type == DATA_SHAZZRAH) IsBossDied[4] = true; - + if (type == DATA_GEDDON) IsBossDied[5] = true; @@ -354,7 +354,7 @@ public: if (IsBossDied[i] == false) return; } - + instance->SummonCreature(ID_DOMO, Pos[0]); instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[1]); instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[2]); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h index 873fe98dd30..8a1cc8fab44 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h @@ -20,7 +20,7 @@ #define DEF_MOLTEN_CORE_H enum eData -{ +{ DATA_FLAMEWAKERPRIEST, DATA_GARRISDEAD, DATA_GEDDONISDEAD, |
