*Merge.

--HG-- branch : trunk
2009-02-13 20:12:01 -06:00
parent 59be8223e4 29f3d67fb8
commit 1c3f478ecc
13 changed files with 150 additions and 97 deletions
@@ -39,6 +39,7 @@ class TRINITY_DLL_DECL MapInstanced : public Map
        void RemoveAllObjectsInRemoveList();
        bool RemoveBones(uint64 guid, float x, float y);
        void UnloadAll(bool pForce);
+        bool CanEnter(Player* player);

        Map* GetInstance(const WorldObject* obj);
        Map* FindMap(uint32 InstanceId) { return _FindMap(InstanceId); }