*Merge.

--HG-- branch : trunk
2009-02-04 19:16:12 -06:00
parent c2550caf96 ae5e608c00
commit cdcf465360
4 changed files with 26 additions and 4 deletions
@@ -579,6 +579,7 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
        void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target);

        bool isVisibleForInState(Player const* u, bool inVisibleList) const;
+        bool canDetectTrap(Player const* u, float distance) const;

        GameObject* LookupFishingHoleAround(float range);