*Merge.

--HG-- branch : trunk
2009-01-25 16:40:51 -06:00
parent f7cfae4332 6be2cfeeed
commit 04cf7fe226
1 changed files with 4 additions and 0 deletions
@@ -2155,6 +2155,10 @@ class TRINITY_DLL_SPEC Player : public Unit
        uint32 GetOldPetSpell() const { return m_oldpetspell; }
        void SetOldPetSpell(uint32 petspell) { m_oldpetspell = petspell; }
        // check if player can fly in map/area according to config
        bool CanFlyInMap(const uint32 mapID) const;
        bool CanFlyInArea(const uint32 areaID) const;
        /*********************************************************/
        /***                 INSTANCE SYSTEM                   ***/
        /*********************************************************/