*Merge.

--HG-- branch : trunk
2009-02-16 19:04:31 -06:00
parent 91e640d14e 5ded6c8df4
commit 00ba699d6f
19 changed files with 102 additions and 191 deletions
@@ -357,7 +357,7 @@ class Spell
        ~Spell();

        void prepare(SpellCastTargets const* targets, Aura* triggeredByAura = NULL);
-        void cancel(bool report = true);
+        void cancel();
        void update(uint32 difftime);
        void cast(bool skipCheck = false);
        void finish(bool ok = true);