*Merge.

--HG-- branch : trunk
2009-02-26 20:43:35 -06:00
parent 39c513776c bc54e91aff
commit d3a6900667
24 changed files with 415 additions and 204 deletions
@@ -1206,7 +1206,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
                return false;
        }
        bool isPossessing(Unit* u) const { return u->isPossessed() && GetCharmGUID() == u->GetGUID(); }
-        bool isPossessingCreature() const { return isPossessing() && IS_CREATURE_GUID(GetCharmGUID()); }

        CharmInfo* GetCharmInfo() { return m_charmInfo; }
        CharmInfo* InitCharmInfo(Unit* charm);