[svn] Merge from mangos.

Wed Oct 29 15:06:00 http://github.com/mangos/mangos/commit/034b8a34a9b621443e97d0ac4b667b603ba31ef1
Mon Oct 27 14:36:42 http://github.com/mangos/mangos/commit/fa072d15107b44344af8c9ef686839984e241a1b

--HG--
branch : trunk

src/game/PetAI.h

@@ -25,6 +25,7 @@
 #include "Timer.h"
 
 class Creature;
+class Spell;
 
 class TRINITY_DLL_DECL PetAI : public CreatureAI
 {
@@ -38,9 +39,9 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
         void DamageTaken(Unit *done_by, uint32& /*damage*/) { AttackedBy(done_by); }
         void AttackedBy(Unit*);
         bool IsVisible(Unit *) const;
+        void JustDied(Unit* who) { _stopAttack(); }
 
         void UpdateAI(const uint32);
-        void UpdateAllies();
         static int Permissible(const Creature *);
 
     private:
@@ -48,11 +49,15 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
         bool _needToStop(void) const;
         void _stopAttack(void);
 
+        void UpdateAllies();
+
         Creature &i_pet;
-        uint64 i_victimGuid;
+        bool inCombat;
         TimeTracker i_tracker;
-        //uint32 i_RepeatAction;
         std::set<uint64> m_AllySet;
         uint32 m_updateAlliesTimer;
+
+        typedef std::pair<Unit*, Spell*> TargetSpellPair;
+        std::vector<TargetSpellPair> m_targetSpellStore;
 };
 #endif