*Remove some code for spells not present in dbc of 313.

--HG--
branch : trunk

src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp

@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
                 break;
             case 29:
                 DoScriptText(SAY_TH_SKARLOC_MEET, m_creature);
-                m_creature->SummonCreature(17862,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
+                m_creature->SummonCreature(ENTRY_SCARLOC,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
                 //temporary,skarloc should rather be triggered to walk up to thrall
                 break;
             case 30:

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp

@@ -56,7 +56,8 @@ EndScriptData */
 #define SPELL_FROST_SHOCK               38234
 #define SPELL_SPITFIRE_TOTEM            38236
 #define SPELL_POISON_CLEANSING_TOTEM    38306
-#define SPELL_POISON_CLEANSING_EFFECT   8167
+// Spell obsolete
+// #define SPELL_POISON_CLEANSING_EFFECT   8167
 #define SPELL_EARTHBIND_TOTEM           38304
 #define SPELL_EARTHBIND_TOTEM_EFFECT    6474
 #define SPELL_WINDFURY_WEAPON           38184

src/game/Level3.cpp

@@ -2133,7 +2133,6 @@ bool ChatHandler::HandleLearnAllCommand(const char* /*args*/)
         "1180",
         "201",
         "12593",
-        "12842",
         "16770",
         "6057",
         "12051",
@@ -2160,9 +2159,7 @@ bool ChatHandler::HandleLearnAllCommand(const char* /*args*/)
         "11129",
         "16766",
         "12573",
-        "15053",
         "12580",
-        "12475",
         "12472",
         "12953",
         "12488",

src/game/SpellAuras.cpp

@@ -2227,8 +2227,6 @@ void AuraEffect::TriggerSpell()
                         return;
                     // Frenzied Regeneration
                     case 22842:
-                    case 22895:
-                    case 22896:
                     case 26999:
                     {
                         int32 LifePerRage = GetAmount();
@@ -2927,34 +2925,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
         }
         case SPELLFAMILY_SHAMAN:
         {
-            if (!Real && !changeAmount)
-                break;
-            // Improved Weapon Totems
-            if( GetSpellProto()->SpellIconID == 57 && m_target->GetTypeId()==TYPEID_PLAYER )
-            {
-                if(apply)
-                {
-                    SpellModifier *mod = new SpellModifier;
-                    mod->op = SPELLMOD_EFFECT1;
-                    mod->value = m_amount;
-                    mod->type = SPELLMOD_PCT;
-                    mod->spellId = GetId();
-                    switch (m_effIndex)
-                    {
-                        case 0:
-                            mod->mask[1] = 0x002;    // Windfury Totem
-                            break;
-                        case 1:
-                            mod->mask[1] = 0x004;    // Flametongue Totem
-                            break;
-                    }
-
-                    m_spellmod = mod;
-                }
-
-                ((Player*)m_target)->AddSpellMod(m_spellmod, apply);
-                return;
-            }
             if (!Real)
                 break;
             // Sentry Totem

src/game/SpellEffects.cpp

@@ -601,7 +601,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
             }
             case SPELLFAMILY_HUNTER:
             {
-                //Gore
+                // Gore
                 if (m_spellInfo->SpellIconID == 1578)
                 {
                     damage+= rand()%2 ? damage : 0;

src/game/Unit.cpp

@@ -2023,11 +2023,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             }
             case SPELLFAMILY_DEATHKNIGHT:
             {
-                // Shadow of Death
-                if (spellProto->Id == 49157)
-                {
-                    continue;
-                }
                 // Anti-Magic Shell (on self)
                 if (spellProto->Id == 48707)
                 {
@@ -8513,14 +8508,6 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
                     SpellEntry const* spellProto = (*itr).second->GetSpellProto();
                     if (spellProto->CasterAuraState == flag)
                     {
-                        // exceptions (applied at state but not removed at state change)
-                        // Rampage
-                        if(spellProto->SpellIconID==2006 && spellProto->SpellFamilyName==SPELLFAMILY_WARRIOR && spellProto->SpellFamilyFlags[0]==0x100000)
-                        {
-                            ++itr;
-                            continue;
-                        }
-
                         RemoveAura(itr);
                     }
                     else

src/game/Unit.h

@@ -56,6 +56,7 @@ enum SpellChannelInterruptFlags
     CHANNEL_FLAG_MOVEMENT    = 0x0008,
     CHANNEL_FLAG_TURNING     = 0x0010,
     CHANNEL_FLAG_DAMAGE2     = 0x0080,
+    CHANNEL_FLAG_ONLY_IN_WATER = 0x0100,
     CHANNEL_FLAG_DELAY       = 0x4000
 };