diff options
| author | Paradox <none@none> | 2009-02-17 20:10:49 -0600 |
|---|---|---|
| committer | Paradox <none@none> | 2009-02-17 20:10:49 -0600 |
| commit | 3931b802f1b8b890a615e5b2a4c0ed70407468d7 (patch) | |
| tree | b1386a80454be7ba341d4fcd4f87c133d9af95a7 /src | |
| parent | 14234c86fa4f1b31436a0289cdac5f92ab430804 (diff) | |
Yet more tabs to spaces
--HG--
branch : trunk
Diffstat (limited to 'src')
5 files changed, 21 insertions, 21 deletions
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index 80b4fa49782..333d13e91f9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); m_creature->GetMotionMaster()->Clear(false); - m_creature->GetMotionMaster()->MoveIdle(); + m_creature->GetMotionMaster()->MoveIdle(); m_creature->SetHover(true); Icebolt_Timer = 4000; Icebolt_Count = 0; @@ -132,16 +132,16 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI }else Icebolt_Timer -= diff; if(Icebolt_Count == 5 && IsInFly && FrostBreath_Timer < diff ) - { + { DoScriptText(EMOTE_BREATH, m_creature); DoCast(m_creature->getVictim(),SPELL_FROST_BREATH); land_Timer = 2000; IsInFly = false; FrostBreath_Timer = 6000; - }else FrostBreath_Timer -= diff; + }else FrostBreath_Timer -= diff; if(!IsInFly && land_Timer < diff) - { + { phase = 1; m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND); m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index 763317d1457..539a3db3ab4 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI TalkSequence = 0; isFriendly = false; isEnraged = false; - isBanished = false; + isBanished = false; } void DamageTaken(Unit *done_by, uint32 &damage) @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI switch(TalkSequence) { case 1: - m_creature->setFaction(35); + m_creature->setFaction(35); TalkTimer = 1000; break; case 2: @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI CheckTimer = 1000; ResetThreat = 1000; isEnraged = false; - isBanished = false; + isBanished = false; } void Aggro(Unit* who) @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI if(Player* i_pl = i->getSource()) if(i_pl->HasAura(AURA_SPECTRAL_REALM,0)) i_pl->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM); - } + } void UpdateAI(const uint32 diff) { @@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (!UpdateVictim()) - return; + return; if(YellTimer < diff) { @@ -559,7 +559,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff) DoCast(m_creature, SPELL_ENRAGE, true); isEnraged = true; } - + if(!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1) { if(Unit *Sath = Unit::GetUnit(*m_creature, SathGUID)) diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index e86c7565628..fa177b7b240 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_FEAR 29321 #define SPELL_VOID_BOLT 39329 #define SPELL_SPOTLIGHT 25824 - + #define CENTER_X 432.909f #define CENTER_Y -373.424f #define CENTER_Z 17.9608f @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI float Portals[3][3]; bool AppearDelay; - bool BlindingLight; + bool BlindingLight; void Reset() { @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI void StartEvent() { DoScriptText(SAY_AGGRO, m_creature); - + if(pInstance) pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); } @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(target); - + Summons.Summon(Summoned); } } @@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } AppearDelay_Timer = 2000; }else AppearDelay_Timer -= diff; - } + } if (Phase == 1) { @@ -236,12 +236,12 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI if(!m_creature->HasInArc(2.5f, target)) target = m_creature->getVictim(); - if(target) + if(target) DoCast(target, SPELL_ARCANE_MISSILES); } ArcaneMissiles_Timer = 3000; }else ArcaneMissiles_Timer -= diff; - + if (MarkOfTheSolarian_Timer < diff) { DoCast(m_creature->getVictim(), MARK_OF_SOLARIAN); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 06b092cf8c4..40edea80ce9 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5680,7 +5680,7 @@ void Aura::PeriodicTick() int32 gain = pCaster->ModifyPower(power,gain_amount); m_target->AddThreat(pCaster, float(gain) * 0.5f, GetSpellSchoolMask(GetSpellProto()), GetSpellProto()); } - + // Mark of Kaz'rogal if(GetId() == 31447 && m_target->GetPower(power) == 0) { diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index b92202375dc..db4df9a5862 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -653,7 +653,7 @@ void Spell::EffectDummy(uint32 i) if(ihit->effectMask & (1<<i)) { Unit* casttarget = Unit::GetUnit((*unitTarget), ihit->targetGUID); - if(casttarget) + if(casttarget) m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false); } } @@ -4978,7 +4978,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 48025: // Headless Horseman's Mount { - if(!unitTarget) + if(!unitTarget) return; if(unitTarget) @@ -4987,7 +4987,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; - case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; + case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; case 300: unitTarget->CastSpell(unitTarget, 48023, true); break; default: break; } |
