*Merge.

--HG-- branch : trunk
2009-05-01 18:37:32 -05:00
parent e1b8fff590 c9cd3b07f9
commit db817d668a
13 changed files with 179 additions and 34 deletions
@@ -2975,8 +2975,7 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real)
        case FORM_FLIGHT:
        case FORM_MOONKIN:
            // remove movement affects
-            m_target->RemoveAurasByType(SPELL_AURA_MOD_ROOT);
-            m_target->RemoveAurasByType(SPELL_AURA_MOD_DECREASE_SPEED);
+            m_target->RemoveMovementImpairingAuras();

            // and polymorphic affects
            if(m_target->IsPolymorphed())