*Merge.

--HG-- branch : trunk
2009-03-14 19:43:31 -06:00
parent ff60cf65a1 bd79f8cb8b
commit d6e878caf2
2 changed files with 3 additions and 3 deletions
@@ -47,7 +47,6 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
        void UpdateAllies();

        Creature &i_pet;
-        bool inCombat;
        TimeTracker i_tracker;
        std::set<uint64> m_AllySet;
        uint32 m_updateAlliesTimer;