*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/src/game/Spell.h b/src/game/Spell.h
index 083bb338371..99017742e2f 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -458,7 +458,7 @@ class Spell
         bool IsDeletable() const { return !m_referencedFromCurrentSpell && !m_executedCurrently; }
         void SetReferencedFromCurrent(bool yes) { m_referencedFromCurrentSpell = yes; }
         bool IsInterruptable() const { return !m_executedCurrently; }
-        void SetExecutedCurrently(bool yes) { m_executedCurrently = yes; }
+        void SetExecutedCurrently(bool yes) {m_executedCurrently = yes;}
         uint64 GetDelayStart() const { return m_delayStart; }
         void SetDelayStart(uint64 m_time) { m_delayStart = m_time; }
         uint64 GetDelayMoment() const { return m_delayMoment; }
@@ -552,7 +552,9 @@ class Spell
         //******************************************
         uint32 m_procAttacker;                // Attacker trigger flags
         uint32 m_procVictim;                  // Victim   trigger flags
-        void   prepareDataForTriggerSystem();
+        uint32 m_procEx;
+        bool m_canTrigger;
+        void   prepareDataForTriggerSystem(AuraEffect * triggeredByAura);
 
         //*****************************************
         // Spell target subsystem