fix CRLF in last 3-4 commits, take note, new devs using windows need to configure the win32text extension properly before pushing anything else.

--HG--
branch : trunk

3 files changed, 62 insertions, 62 deletions

diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp
index 83f76254b4b..1b099152397 100644
--- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp
+++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp
@@ -32,58 +32,58 @@ enum eDrakuruShackles
     NPC_RAGECLAW               = 29686
 };
 
-struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI

-{

-    npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {}

-

-    Unit* Rageclaw;

-

-    void Reset()

-    {

-        Rageclaw = NULL;

-        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);

-

-        float x, y, z;

-        m_creature->GetClosePoint(x, y, z, m_creature->GetObjectSize() / 3, 0.1f);

-

-        if (Unit* summon = m_creature->SummonCreature(NPC_RAGECLAW, x, y, z,

-            0, TEMPSUMMON_DEAD_DESPAWN, 1000))

-        {

-            Rageclaw = summon;

-            LockRageclaw();

-        }

-    }

-

-    void LockRageclaw()

-    {

-        m_creature->SetInFront(Rageclaw);

-        Rageclaw->SetInFront(m_creature);

-

-        DoCast(Rageclaw, SPELL_LEFT_CHAIN, true);

-        DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true);

-    }

-

-    void UnlockRageclaw(Unit* pWho)

-    {

-        if (!pWho)

-            return;

-

-        DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true);

-

-        m_creature->setDeathState(DEAD);

-    }

-

-    void SpellHit(Unit* pCaster, const SpellEntry* pSpell)

-    {

-        if (pSpell->Id == SPELL_UNLOCK_SHACKLE)

-        {

-            if (Rageclaw)

-                UnlockRageclaw(pCaster);

-            else

-                m_creature->setDeathState(JUST_DIED);

-        }

-    }

-};

+struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI
+{
+    npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {}
+
+    Unit* Rageclaw;
+
+    void Reset()
+    {
+        Rageclaw = NULL;
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+        float x, y, z;
+        m_creature->GetClosePoint(x, y, z, m_creature->GetObjectSize() / 3, 0.1f);
+
+        if (Unit* summon = m_creature->SummonCreature(NPC_RAGECLAW, x, y, z,
+            0, TEMPSUMMON_DEAD_DESPAWN, 1000))
+        {
+            Rageclaw = summon;
+            LockRageclaw();
+        }
+    }
+
+    void LockRageclaw()
+    {
+        m_creature->SetInFront(Rageclaw);
+        Rageclaw->SetInFront(m_creature);
+
+        DoCast(Rageclaw, SPELL_LEFT_CHAIN, true);
+        DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true);
+    }
+
+    void UnlockRageclaw(Unit* pWho)
+    {
+        if (!pWho)
+            return;
+
+        DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true);
+
+        m_creature->setDeathState(DEAD);
+    }
+
+    void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
+    {
+        if (pSpell->Id == SPELL_UNLOCK_SHACKLE)
+        {
+            if (Rageclaw)
+                UnlockRageclaw(pCaster);
+            else
+                m_creature->setDeathState(JUST_DIED);
+        }
+    }
+};
 
 
 CreatureAI* GetAI_npc_drakuru_shackles(Creature* pCreature)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 5bff50196ce..adf82f3289f 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -437,13 +437,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
                 // Shield Slam
                 else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209)
-                {

-                    damage += int32(m_caster->GetShieldBlockValue());

-

-                    // Glyph of Shield Slam

-                    if (m_caster->HasAura(58375))

-                        m_caster->CastSpell(m_caster, 58374, true);

-                }

+                {
+                    damage += int32(m_caster->GetShieldBlockValue());
+
+                    // Glyph of Shield Slam
+                    if (m_caster->HasAura(58375))
+                        m_caster->CastSpell(m_caster, 58374, true);
+                }
 
                 // Victory Rush
                 else if(m_spellInfo->SpellFamilyFlags[1] & 0x100)
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index ae694ffbdbf..36c7cf23e22 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10270,9 +10270,9 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
             TakenTotalMod *= (HealingWay->GetAmount() + 100.0f) / 100.0f;
     }
 
-    // Tenacity increase healing % taken

-    if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))

-        TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;

+    // Tenacity increase healing % taken
+    if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))
+        TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;
 
 
     // Healing taken percent