*Merge.

--HG-- branch : trunk
2009-02-07 12:00:37 -06:00
parent 061d10d875 4ed12b0e17
commit a4395bafbb
4 changed files with 43 additions and 33 deletions
@@ -596,8 +596,10 @@ class Spell
        // -------------------------------------------

        //List For Triggered Spells
-        typedef std::list<SpellEntry const*> TriggerSpells;
+        typedef std::vector<SpellEntry const*> TriggerSpells;
        TriggerSpells m_TriggerSpells;
+        typedef std::vector< std::pair<SpellEntry const*, int32> > ChanceTriggerSpells;
+        ChanceTriggerSpells m_ChanceTriggerSpells;

        uint32 m_spellState;
        uint32 m_timer;