Merge

--HG-- branch : trunk
2009-06-09 21:56:56 +02:00
parent 41baf8b0d3 c5232138f8
commit 1afdfd9106
27 changed files with 368 additions and 63 deletions
@@ -1441,7 +1441,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
        // set withDelayed to true to account delayed spells as casted
        // delayed+channeled spells are always accounted as casted
        // we can skip channeled or delayed checks using flags
-        bool IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled = false, bool skipAutorepeat = false) const;
+        bool IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled = false, bool skipAutorepeat = false, bool isAutoshoot = false) const;

        // set withDelayed to true to interrupt delayed spells too
        // delayed+channeled spells are always interrupted